From 08ae72cfbb6e27994ce5f5a17199cf7effd6ae82 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Mon, 16 Sep 2024 15:14:05 +0200 Subject: [PATCH 01/24] Added basic functionality --- .vscode/launch.json | 3 +- .vscode/settings.json | 2 +- api/.eslintrc.json | 408 +++-- api/.gitignore | 12 +- api/Logger.ts | 59 - api/api.ts | 39 +- api/definitions/global.d.ts | 12 +- api/package.json | 33 +- api/prisma/schema.prisma | 1 + api/routes/ProgressbarRoute.ts | 52 +- api/routes/TimezonesRoute.ts | 12 +- api/routes/sharp/Prisma.ts | 4 +- api/routes/sharp/SharpDiscord.ts | 2 +- api/routes/sharp/managers/TextManager.ts | 22 +- api/routes/sharp/replaceColor.ts | 2 +- api/routes/{ => sharp/v1}/SharpRoute.ts | 46 +- api/routes/sharp/{ => v1}/managers/Image.ts | 19 +- .../sharp/{ => v1}/managers/ImageEditor.ts | 32 +- .../sharp/{ => v1}/managers/ImageFetcher.ts | 11 +- .../sharp/{ => v1}/managers/ImageManager.ts | 41 +- api/routes/sharp/v1/managers/TextManager.ts | 362 +++++ .../sharp/{ => v1}/mapBody/bodyMappings.ts | 4 +- api/routes/sharp/{ => v1}/mapBody/index.ts | 6 +- api/routes/sharp/v2/Context.ts | 75 + api/routes/sharp/v2/Image.ts | 73 + api/routes/sharp/v2/Operation.ts | 101 ++ api/routes/sharp/v2/OperationHandler.ts | 198 +++ api/routes/sharp/v2/Operations.ts.disabled | 76 + api/routes/sharp/v2/SharpRoute.ts | 54 + api/routes/sharp/v2/operations/Crop.ts | 46 + api/routes/sharp/v2/operations/Fill.ts | 25 + api/routes/sharp/v2/operations/Flip.ts | 26 + api/routes/sharp/v2/operations/Opacity.ts | 20 + api/routes/sharp/v2/operations/Resize.ts | 36 + api/routes/sharp/v2/operations/Rotate.ts | 16 + api/routes/sharp/v2/operations/Text.ts | 246 +++ .../sharp/v2/operations/index.ts.disabled | 25 + api/routes/sharp/v2/services/ImageEditor.ts | 56 + api/routes/sharp/v2/services/ImageFetcher.ts | 39 + api/routes/sharp/v2/services/ImageManager.ts | 16 + api/routes/sharp/v2/services/TextManager.ts | 363 +++++ api/routes/sharp/v2/validateInput.ts | 84 + api/tsconfig.json | 6 +- api/types/ImageTypes.ts | 4 +- api/types/PayloadTypes.ts | 29 +- api/types/index.ts | 2 +- .../sharp/managers => utils}/CacheManager.ts | 14 +- api/utils/HttpException.ts | 9 + api/{routes/sharp/managers => utils}/Timer.ts | 9 +- api/utils/env/createEnv.ts | 4 +- api/utils/env/validateEnv.ts | 1 - api/utils/logging/CatLoggr.ts | 514 ------ api/utils/logging/NiceLogger.ts | 59 + api/utils/logging/WinstonLogger.ts | 68 + api/utils/mapping/mapArray.ts | 2 +- api/utils/mapping/mapBase64.ts | 2 +- api/utils/mapping/mapBigInt.ts | 2 +- api/utils/mapping/mapBoolean.ts | 8 +- api/utils/mapping/mapChoice.ts | 2 +- api/utils/mapping/mapDate.ts | 2 +- api/utils/mapping/mapDuration.ts | 2 +- api/utils/mapping/mapFake.ts | 2 +- api/utils/mapping/mapGuard.ts | 2 +- api/utils/mapping/mapIn.ts | 4 +- api/utils/mapping/mapInstanceof.ts | 8 +- api/utils/mapping/mapJObject.ts | 2 +- api/utils/mapping/mapJToken.ts | 2 +- api/utils/mapping/mapJson.ts | 2 +- api/utils/mapping/mapNumber.ts | 8 +- api/utils/mapping/mapObject.ts | 10 +- api/utils/mapping/mapRecord.ts | 2 +- api/utils/mapping/mapRegex.ts | 4 +- api/utils/mapping/mapString.ts | 2 +- api/utils/mapping/mapTuple.ts | 2 +- api/utils/mapping/mapTypeof.ts | 4 +- api/utils/mapping/mapUnknown.ts | 2 +- api/yarn.lock | 1431 +++++++++++++---- 77 files changed, 3618 insertions(+), 1367 deletions(-) delete mode 100644 api/Logger.ts rename api/routes/{ => sharp/v1}/SharpRoute.ts (75%) rename api/routes/sharp/{ => v1}/managers/Image.ts (96%) rename api/routes/sharp/{ => v1}/managers/ImageEditor.ts (96%) rename api/routes/sharp/{ => v1}/managers/ImageFetcher.ts (91%) rename api/routes/sharp/{ => v1}/managers/ImageManager.ts (91%) create mode 100644 api/routes/sharp/v1/managers/TextManager.ts rename api/routes/sharp/{ => v1}/mapBody/bodyMappings.ts (91%) rename api/routes/sharp/{ => v1}/mapBody/index.ts (97%) create mode 100644 api/routes/sharp/v2/Context.ts create mode 100644 api/routes/sharp/v2/Image.ts create mode 100644 api/routes/sharp/v2/Operation.ts create mode 100644 api/routes/sharp/v2/OperationHandler.ts create mode 100644 api/routes/sharp/v2/Operations.ts.disabled create mode 100644 api/routes/sharp/v2/SharpRoute.ts create mode 100644 api/routes/sharp/v2/operations/Crop.ts create mode 100644 api/routes/sharp/v2/operations/Fill.ts create mode 100644 api/routes/sharp/v2/operations/Flip.ts create mode 100644 api/routes/sharp/v2/operations/Opacity.ts create mode 100644 api/routes/sharp/v2/operations/Resize.ts create mode 100644 api/routes/sharp/v2/operations/Rotate.ts create mode 100644 api/routes/sharp/v2/operations/Text.ts create mode 100644 api/routes/sharp/v2/operations/index.ts.disabled create mode 100644 api/routes/sharp/v2/services/ImageEditor.ts create mode 100644 api/routes/sharp/v2/services/ImageFetcher.ts create mode 100644 api/routes/sharp/v2/services/ImageManager.ts create mode 100644 api/routes/sharp/v2/services/TextManager.ts create mode 100644 api/routes/sharp/v2/validateInput.ts rename api/{routes/sharp/managers => utils}/CacheManager.ts (85%) create mode 100644 api/utils/HttpException.ts rename api/{routes/sharp/managers => utils}/Timer.ts (99%) delete mode 100644 api/utils/logging/CatLoggr.ts create mode 100644 api/utils/logging/NiceLogger.ts create mode 100644 api/utils/logging/WinstonLogger.ts diff --git a/.vscode/launch.json b/.vscode/launch.json index 6f58e6e..8d648c5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,7 +18,8 @@ "program": "${workspaceFolder}/api/api.ts", "outFiles": [ "${workspaceFolder}/**/*.js" - ] + ], + "envFile": "${workspaceFolder}/api/.env" } ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index b055495..d193d49 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,7 +8,7 @@ }, "eslint.workingDirectories": ["./api"], "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "editor.defaultFormatter": "vscode.typescript-language-features", "npm.packageManager": "yarn", diff --git a/api/.eslintrc.json b/api/.eslintrc.json index 212a0ad..698bdc1 100644 --- a/api/.eslintrc.json +++ b/api/.eslintrc.json @@ -1,248 +1,202 @@ { + "root": true, + "env": { + "node": true + }, "extends": [ - "eslint:recommended" + "eslint:recommended", + "plugin:@typescript-eslint/recommended-type-checked", + "plugin:import/recommended", + "plugin:import/typescript", + "plugin:require-extensions/recommended" ], + "parser": "@typescript-eslint/parser", "plugins": [ - "simple-import-sort", - "import" + "@stylistic/eslint-plugin", + "@stylistic/ts", + "@typescript-eslint", + "import", + "simple-import-sort", + "require-extensions" ], "parserOptions": { - "ecmaVersion": 8, - "sourceType": "module", - "ecmaFeatures": { - "arrowFunctions": true, - "binaryLiterals": true, - "blockBindings": true, - "classes": true, - "defaultParams": true, - "destructuring": true, - "forOf": true, - "generators": true, - "modules": true, - "objectLiteralComputedProperties": true, - "objectLiteralDuplicateProperties": true, - "objectLiteralShorthandMethods": true, - "objectLiteralShorthandProperties": true, - "octalLiterals": true, - "regexUFlag": true, - "regexYFlag": true, - "spread": true, - "superInFunctions": true, - "templateStrings": true, - "unicodeCodePointEscapes": true, - "globalReturn": true + "project": true, + "tsconfigRootDir": "./" + }, + "ignorePatterns": [ + "out/*", + "old/*" + ], + "settings": { + "import/parsers": { + "@typescript-eslint/parser": [ + ".ts", + ".tsx" + ] + }, + "import/resolver": { + "typescript": { + "alwaysTryTypes": true // always try to resolve types under `@types` directory even it doesn't contain any source code, like `@types/unist` } + } }, "rules": { - "eqeqeq": "error", - "eol-last": [ - "warn", - "always" - ], - "no-multiple-empty-lines": [ - "warn", - { - "max": 1, - "maxEOF": 0, - "maxBOF": 0 - } + "@stylistic/no-mixed-spaces-and-tabs": 2, + "@stylistic/ts/lines-between-class-members": [ + "error", + "always", + { + "exceptAfterSingleLine": true, + "exceptAfterOverload": true + } + ], + "@stylistic/object-curly-spacing": [ + "error", "always" + ], + "@stylistic/no-multiple-empty-lines": [ + "error", + { + "max": 1 + } + ], + "@stylistic/operator-linebreak": [ + "error", + "after" + ], + "@stylistic/no-multi-spaces": [ + "error" + ], + "@stylistic/space-infix-ops": "error", + "@stylistic/arrow-spacing": "error", + "@stylistic/block-spacing": "error", + "@stylistic/arrow-parens": ["error", "always"], + "brace-style": [ + "warn", + "1tbs", + { + "allowSingleLine": true + } + ], + "comma-dangle": "warn", + "comma-spacing": "error", + "eol-last": [ + "warn", + "always" + ], + "eqeqeq": "error", + "guard-for-in": "warn", + "import/first": "error", + "import/newline-after-import": "error", + "import/no-duplicates": "error", + "import/no-unresolved": "error", + "indent": [ + "error", + 4, + { + "SwitchCase": 1 + } + ], + "max-statements-per-line": [ + "error", + { + "max": 1 + } + ], + "no-alert": "error", + "no-console": "error", + "no-else-return": "error", + "no-global-assign": "error", + "no-iterator": "error", + "no-lone-blocks": "warn", + "no-lonely-if": "error", + "no-multiple-empty-lines": [ + "warn", + { + "max": 1, + "maxEOF": 0, + "maxBOF": 0 + } + ], + "no-new-func": "error", + "no-proto": "error", + "no-sequences": "error", + "no-trailing-spaces": "warn", + "no-var": "error", + "one-var": [ + "error", + "never" + ], + "one-var-declaration-per-line": [ + "error", + "always" + ], + "quotes": [ + "error", + "single", + { + "avoidEscape": false + } + ], + "semi": [ + 2, + "always" + ], + "simple-import-sort/exports": "error", + "simple-import-sort/imports": "error", + "strict": "error" + }, + "overrides": [ + { + // enable the rule specifically for TypeScript files + "files": [ + "*.ts", + "*.mts", + "*.cts", + "*.tsx" ], - "strict": "error", - "semi": "error", - "quotes": [ - "error", - "single", - { - "avoidEscape": false - } + "plugins": [ + "@typescript-eslint" ], - "indent": [ - "error", - 4, - { - "SwitchCase": 1 - } + "extends": [ + "plugin:@typescript-eslint/recommended-type-checked", + "plugin:@typescript-eslint/stylistic-type-checked" + //"plugin:@typescript-eslint/recommended-requiring-type-checking" ], - "simple-import-sort/imports": "error", - "import/first": "error", - "import/newline-after-import": "error", - "import/no-duplicates": "error", - "comma-spacing": "error", - "no-global-assign": "error", - "no-console": "error", - "no-alert": "error", - "no-lone-blocks": "warn", - "no-new-func": "error", - "no-proto": "error", - "no-iterator": "error", - "no-lonely-if": "error", - "no-var": "error", - "max-statements-per-line": [ + "parser": "@typescript-eslint/parser", + "parserOptions": { + "project": "./tsconfig.json" + }, + "rules": { + "no-console": 1, + "@typescript-eslint/explicit-member-accessibility": "error", + "@typescript-eslint/class-literal-property-style": [ "error", - { - "max": 1 - } - ], - "one-var-declaration-per-line": [ + "fields" + ], + "@typescript-eslint/return-await": [ "error", "always" - ], - "one-var": [ + ], + "@typescript-eslint/explicit-function-return-type": [ "error", - "never" - ], - "brace-style": [ - "warn", - "1tbs", { - "allowSingleLine": true + "allowExpressions": true } - ], - "comma-dangle": "warn", - "no-sequences": "error", - "no-else-return": "error", - "guard-for-in": "warn", - "no-trailing-spaces": "warn" - }, - "overrides": [ - { - "files": [ - "*.ts", - "*.cts", - "*.mts" - ], - "env": { - "node": true - }, - "parser": "@typescript-eslint/parser", - "parserOptions": { - "project": "./tsconfig.json" - }, - "plugins": [ - "@typescript-eslint" - ], - "extends": [ - "plugin:@typescript-eslint/recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended-requiring-type-checking" - ], - "rules": { - "@typescript-eslint/no-unused-vars": [ - "error", - { - "varsIgnorePattern": "^_", - "ignoreRestSiblings": true - } - ], - "@typescript-eslint/explicit-member-accessibility": "error", - "@typescript-eslint/restrict-template-expressions": [ - "error", - { - "allowNumber": true, - "allowBoolean": true, - "allowAny": false, - "allowNullish": false - } - ], - "@typescript-eslint/naming-convention": [ - "error", - { - "selector": "default", - "format": [ - "camelCase", - "snake_case", - "UPPER_CASE" - ], - "leadingUnderscore": "allow", - "trailingUnderscore": "allow" - }, - { - "selector": "enumMember", - "format": [ - "UPPER_CASE" - ] - }, - { - "selector": "typeLike", - "format": [ - "PascalCase" - ] - }, - { - "selector": [ - "objectLiteralProperty", - "objectLiteralMethod" - ], - "format": null - } - ], - "@typescript-eslint/no-unnecessary-condition": [ - "error", - { - "allowConstantLoopConditions": true - } - ], - "@typescript-eslint/no-extra-parens": "error", - "@typescript-eslint/no-implicit-any-catch": "error", - "@typescript-eslint/no-require-imports": "error", - "@typescript-eslint/prefer-for-of": "error", - "@typescript-eslint/prefer-includes": "warn", - "@typescript-eslint/prefer-nullish-coalescing": "warn", - "@typescript-eslint/prefer-optional-chain": "error", - "@typescript-eslint/prefer-readonly": "error", - "@typescript-eslint/prefer-reduce-type-parameter": "error", - "@typescript-eslint/prefer-string-starts-ends-with": "error", - "@typescript-eslint/prefer-ts-expect-error": "error", - "@typescript-eslint/strict-boolean-expressions": [ - "error", - { - "allowString": false, - "allowNumber": false, - "allowNullableObject": false, - "allowNullableBoolean": false, - "allowNullableString": false, - "allowNullableNumber": false, - "allowAny": false, - "allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing": true - } - ], - "@typescript-eslint/no-unsafe-argument": "error", - "@typescript-eslint/unbound-method": "error", - "@typescript-eslint/array-type": [ - "error", - { - "default": "array-simple", - "readonly": "array-simple" - } - ], - "@typescript-eslint/member-delimiter-style": [ - "error", - { - "multiline": { - "delimiter": "semi", - "requireLast": true - }, - "singleline": { - "delimiter": "semi", - "requireLast": true - } - } - ], - "@typescript-eslint/class-literal-property-style": [ - "error", - "fields" - ], - "@typescript-eslint/return-await": [ - "error", - "always" - ], - "@typescript-eslint/explicit-function-return-type": [ - "error", - { - "allowExpressions": true - } - ] + ], + "@typescript-eslint/strict-boolean-expressions": [ + "error", + { + "allowString": false, + "allowNumber": false, + "allowNullableObject": false, + "allowNullableBoolean": false, + "allowNullableString": false, + "allowNullableNumber": false, + "allowAny": false, + "allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing": true } + ] } + } ] -} \ No newline at end of file + } \ No newline at end of file diff --git a/api/.gitignore b/api/.gitignore index 95d13cb..46f440c 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -1,9 +1,19 @@ +# Ignore JS files *.js *js.map + +# NPM and yarn node_modules +yarn-error.log + +# Config files config.json +.env + +# Ignore assets routes/sharp/images/* prisma/migrations* ./build.sh assets/fonts/google -tmp \ No newline at end of file + +tmp diff --git a/api/Logger.ts b/api/Logger.ts deleted file mode 100644 index e093fe8..0000000 --- a/api/Logger.ts +++ /dev/null @@ -1,59 +0,0 @@ -import chalk from 'chalk'; - -import CatLoggr, { LogLevel as CatLogLevel } from './utils/logging/CatLoggr.js'; - -export type LoggerMethods = { [P in LogTypes]: (...args: unknown[]) => void; } - -export interface Logger extends CatLoggr, LoggerMethods { -} - -type LogLevels = typeof logLevels[number]; -type LogTypes = - | LogLevels['name'] - | Extract['aliases'][number]; - -export function createLogger(): Logger { - const logger = new CatLoggr({ - levels: logLevels.map(l => { - const level = new CatLogLevel(l.name, l.color); - if ('aliases' in l) - level.aliases = [...l.aliases]; - if ('isError' in l) - level.err = l.isError; - return level; - }) - }).meta(); - - return logger; -} - -export class NiceLogger { - public readonly logger: Logger; - public constructor() { - this.logger = createLogger(); - } - public log(level: LogTypes, str: unknown): void; - public log(level: LogTypes, scope: string, ...args: unknown[]): void; - public log(level: LogTypes, ...args: unknown[]): void { - const scope = args.length !== 1 && (args[0] ?? '') !== '' - ? chalk.bold.hex('#6E00FF')(args.shift()) : undefined; - if (level === 'warning') - args = args.map(i => chalk.yellow(i)); - if (scope !== undefined) - this.logger[level](scope, ...args); - else - this.logger[level](...args); - } - -} - -// A ZWS character is used to fix cases where there is too much padding -const logLevels = [ - { name: '❌', color: CatLoggr._chalk.black.bgBlack, aliases: ['error'], isError: true }, - { name: '❓', color: CatLoggr._chalk.black.bgYellow, aliases: ['warning'], isError: true }, - { name: '✅', color: CatLoggr._chalk.bgGreenBright, aliases: ['info'] }, - { name: '📸', color: CatLoggr._chalk.bgCyan, aliases: ['image'] }, - { name: '💾', color: CatLoggr._chalk.white.bgCyanBright, aliases: ['prisma', 'db'] }, - { name: '⌛', color: CatLoggr._chalk.white.bgBlueBright, aliases: ['time', 'stopwatch', 'sw'] }, - { name: '📬', color: CatLoggr._chalk.white.bgMagenta, aliases: ['endpoint'] } -] as const; diff --git a/api/api.ts b/api/api.ts index f46f1ed..1fd391f 100644 --- a/api/api.ts +++ b/api/api.ts @@ -1,23 +1,15 @@ -import express, { NextFunction, Request, Response } from 'express'; +import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; import http from 'http'; -import { NiceLogger } from './Logger.js'; import ProgressBarRoute from './routes/ProgressbarRoute.js'; -import SharpRoute from './routes/SharpRoute.js'; +//import SharpRoute from './routes/sharp/v1/SharpRoute.js'; +import SharpRouteV2 from './routes/sharp/v2/SharpRoute.js'; import TimezonesRoute from './routes/TimezonesRoute.js'; import env from './utils/env/createEnv.js'; +import HttpException from './utils/HttpException.js'; +import { defaultLogLevels, NiceLogger } from './utils/logging/NiceLogger.js'; -class HttpException extends Error { - public status: number; - public message: string; - public constructor(status: number, message: string) { - super(message); - this.status = status; - this.message = message; - } - -} - +const logger = new NiceLogger({ levels: defaultLogLevels }); const app = express(); app.get('/', (_, res) => { res.redirect('https://api.nicelink.xyz/docs'); @@ -26,14 +18,15 @@ const server = http.createServer(app); app.set('trust proxy', 1); -app.use(express.urlencoded({ extended: false })); -app.use(express.json({ strict: false })); +app.use(urlencoded({ extended: false })); +app.use(json({ strict: false })); -const logger = new NiceLogger(); -const sharpRoute = new SharpRoute(logger, env); +//const sharpRoute = new SharpRoute(logger, env); +const sharpRouteV2 = new SharpRouteV2(logger); //* Alias -app.use('/sharp', sharpRoute.router); -app.use('/jimp', sharpRoute.router); +app.use('/sharp/v2', sharpRouteV2.router); +//app.use('/sharp/v1', sharpRoute.router); +//app.use('/jimp', sharpRoute.router); app.use('/misc/progressbar', new ProgressBarRoute(logger).router); app.use('/timezones', new TimezonesRoute().router); @@ -41,13 +34,13 @@ app.use('/timezones', new TimezonesRoute().router); app.use((err: HttpException, _: Request, res: Response, next: NextFunction): void => { if (err.status === 400 && 'body' in err) { if (err instanceof SyntaxError) { - logger.log('error', 'API', `${err.name}: ${err.message}`); + logger.log.error('API', `${err.name}: ${err.message}`); } else - logger.log('error', err); + logger.log.error('error', err); return void res.status(400).send({ status: 400, message: err.message }); } next(); }); server.listen(env.PORT, () => { - logger.log('info', 'API', 'Listening on port', +(env.PORT ?? '')); + logger.log.info('API', 'Listening on port', +(env.PORT ?? '')); }); diff --git a/api/definitions/global.d.ts b/api/definitions/global.d.ts index 107e465..e9a2dd3 100644 --- a/api/definitions/global.d.ts +++ b/api/definitions/global.d.ts @@ -3,12 +3,12 @@ import ''; declare global { // eslint-disable-next-line @typescript-eslint/ban-types type Primitive = string | number | bigint | boolean | object | Function | symbol | undefined; - type JToken = JObject | JArray | JValue | null | undefined; + type JToken = { [key: string]: JToken; } | JArray | JValue | null | undefined; type JValue = string | number | boolean; - type JObject = { [key: string]: JToken; }; + type JObject = Record; type JArray = JToken[]; type JTokenType = keyof JTokenTypeMap; - type JTokenTypeMap = { + interface JTokenTypeMap { 'string': string; 'number': number; 'boolean': boolean; @@ -38,9 +38,9 @@ declare global { type FilteredKeys = { [P in keyof T]: T[P] extends U ? P : never }[keyof T]; interface ObjectConstructor { - keys(value: Exclude): Array; - values(value: Exclude): Array; - entries(value: Exclude): Array<[string & keyof T, T[string & keyof T]]>; + keys(value: Exclude): (string & keyof T)[]; + values(value: Exclude): T[keyof T][]; + entries(value: Exclude): [string & keyof T, T[string & keyof T]][]; // eslint-disable-next-line @typescript-eslint/ban-types create(value: T): T; fromEntries(entries: Iterable): Record; diff --git a/api/package.json b/api/package.json index eb75c27..399b6f4 100644 --- a/api/package.json +++ b/api/package.json @@ -19,9 +19,9 @@ "lint:fix": "eslint --ext .ts --fix ./" }, "dependencies": { - "@prisma/client": "^4.7.1", + "@prisma/client": "^5.10.2", "buffer-image-size": "^0.6.4", - "canvas": "2.11.0", + "canvas": "2.11.2", "cat-loggr": "^1.2.2", "chalk": "^5.1.2", "color": "^4.2.3", @@ -33,17 +33,20 @@ "envalid": "^7.3.1", "eris": "^0.17.1", "express": "^4.18.2", + "fastify": "^4.23.2", "file-type": "^18.0.0", - "mathjs": "^11.3.3", + "lodash": "^4.17.21", + "mathjs": "^12.4.0", "mime-types": "^2.1.35", "moment-timezone": "^0.5.39", "node-fetch": "^3.3.0", "node-worker-threads-pool": "^1.5.1", "pb-text-format-to-json": "^1.1.1", "pg": "^8.8.0", - "sharp": "^0.31.3", + "sharp": "^0.33.2", "uuid": "^9.0.0", - "uuid-by-string": "^4.0.0" + "uuid-by-string": "^4.0.0", + "winston": "^3.11.0" }, "repository": { "type": "git", @@ -56,32 +59,34 @@ }, "homepage": "https://github.com/RagingLink/nicelink-api#readme", "devDependencies": { + "@stylistic/eslint-plugin": "^1.6.3", "@types/bent": "^7.3.2", "@types/chalk": "^2.2.0", "@types/color": "^3.0.3", "@types/color-convert": "^2.0.0", "@types/config": "^3.3.0", - "@types/delta-e": "^0.0.0", + "@types/delta-e": "^0.0.2", "@types/express": "^4.17.13", + "@types/lodash": "^4.14.199", "@types/mime-types": "^2.1.1", "@types/node": "^16.11.38", "@types/node-fetch": "^2.6.2", "@types/node-sass": "^4.11.2", "@types/parsimmon": "^1.10.6", "@types/pg": "^8.6.5", - "@types/sharp": "^0.31.0", - "@types/uuid": "^8.3.4", + "@types/uuid": "^9.0.8", "@types/ws": "^8.5.4", - "@typescript-eslint/eslint-plugin": "^5.43.0", - "@typescript-eslint/parser": "^5.48.1", + "@typescript-eslint/eslint-plugin": "^7.1.0", + "@typescript-eslint/parser": "^7.1.0", "del-cli": "^5.0.0", "eslint": "^8.1.0", "eslint-import-resolver-typescript": "^3.5.2", "eslint-plugin-import": "^2.26.0", - "eslint-plugin-simple-import-sort": "^7.0.0", - "eslint-plugin-sort": "^1.5.0", - "prisma": "^4.7.1", - "typescript": "^4.7.2" + "eslint-plugin-require-extensions": "^0.1.3", + "eslint-plugin-simple-import-sort": "^12.0.0", + "eslint-plugin-sort": "^2.11.0", + "prisma": "^5.10.2", + "typescript": "^5.4.0" }, "type": "module" } diff --git a/api/prisma/schema.prisma b/api/prisma/schema.prisma index 3cae8bd..e9e0390 100644 --- a/api/prisma/schema.prisma +++ b/api/prisma/schema.prisma @@ -19,4 +19,5 @@ model Image { last_accessed DateTime cache_duration Int persisted Boolean? + api_version Int @default(1) } \ No newline at end of file diff --git a/api/routes/ProgressbarRoute.ts b/api/routes/ProgressbarRoute.ts index e0fecbc..f07c735 100644 --- a/api/routes/ProgressbarRoute.ts +++ b/api/routes/ProgressbarRoute.ts @@ -1,48 +1,44 @@ import Color from 'color'; -import express, { Request, Response } from 'express'; +import { Request, Response, Router } from 'express'; import fs from 'fs'; import path from 'path'; import sharp from 'sharp'; import * as url from 'url'; -import { NiceLogger } from '../Logger.js'; -import CacheManager from './sharp/managers/CacheManager.js'; +import CacheManager from '../utils/CacheManager.js'; +import { DefaultLogger } from '../utils/logging/NiceLogger.js'; export default class ProgressBarRoute { - public router = express.Router(); + public router = Router(); #assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', 'assets', 'img'); private readonly pillBg = fs.readFileSync(this.#assetsPath + '/1000x64_pillshape.png'); private readonly pillShape = fs.readFileSync(this.#assetsPath + '/996x60_pillshape.png'); - private readonly cache: CacheManager<{buffer: Buffer;}>; + private readonly cache: CacheManager<{ buffer: Buffer; }>; - public constructor(public readonly logger: NiceLogger) { - this.cache = new CacheManager({refresh: 6, hours: 24 * 2}); + public constructor(public readonly logger: DefaultLogger) { + this.cache = new CacheManager({ refresh: 6, hours: 24 * 2 }); this.router.get('/', (req, res) => void this.getProgressbar(req, res)); this.cache.registerMultipleSweepHandler((items) => { if (items.length === 0 ) return; - this.logger.log('info', 'ProgressbarRoute', `Deleted ${items.length} cached bars`); + this.logger.log.info('ProgressbarRoute', `Deleted ${items.length} cached bars`); }); } public getProgressbar(req: Request, res: Response): void { - let colour = (req.query.c ?? req.query.color ?? req.query.colour ?? '#FFFFFF').toString(); + let colour = String(req.query.c ?? req.query.color ?? req.query.colour ?? '#FFFFFF'); if (/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(colour)) colour = '#' + colour; - let percentage: number; - if (typeof req.query.p === 'string') - percentage = parseInt(req.query.p); - else if (typeof req.query.percentage === 'string') - percentage = parseInt(req.query.percentage); - else percentage = NaN; + const percentage = toInt(req.query.p) ?? toInt(req.query.percentage) ?? NaN; + if (isNaN(percentage)) return void res.send('Invalid percentage'); if (percentage < 0 || percentage > 100) return void res.send('Percentage out of range'); - const pillID = colour + percentage.toString(); + const pillID = `${colour}${percentage}`; const cachedPill = this.cache.get(pillID); if (cachedPill !== undefined) { res.set('Content-Type', 'image/png'); @@ -51,6 +47,7 @@ export default class ProgressBarRoute { return void this.generatePillImage(res, percentage, colour); } + private generatePillImage(res: Response, percentage: number, colour: string): void { try { res.type('png'); @@ -66,17 +63,17 @@ export default class ProgressBarRoute { b: rgb[2] } } - }).composite([{ input: this.pillShape, blend: 'dest-in' }]).png().toBuffer().then(data => { - void sharp(data).extract({ top: 0, left: 0, height: 60, width: Math.round(996 / 100 * percentage) }).png().toBuffer().then(pillBuffer => { - void sharp(this.pillBg).composite([{ input: pillBuffer, top: 2, left: 2 }]).toBuffer().then(buffer => { - this.cache.set( colour + percentage.toString(), {buffer}); + }).composite([{ input: this.pillShape, blend: 'dest-in' }]).png().toBuffer().then((data) => { + void sharp(data).extract({ top: 0, left: 0, height: 60, width: Math.round(996 / 100 * percentage) }).png().toBuffer().then((pillBuffer) => { + void sharp(this.pillBg).composite([{ input: pillBuffer, top: 2, left: 2 }]).toBuffer().then((buffer) => { + this.cache.set( colour + percentage.toString(), { buffer }); res.set('Content-Type', 'image/png'); res.send(buffer); }); }); }); } catch (e: unknown) { - this.logger.log('error', 'Progressbar', e); + this.logger.log.error('Progressbar', e); if (e instanceof Error) res.send(e.message); else @@ -84,3 +81,16 @@ export default class ProgressBarRoute { } } } + +function toInt(input: unknown): number | undefined { + switch (typeof input) { + case 'string': + return parseInt(input); + case 'number': + return input; + default: + if (input === undefined || input === null) + return undefined; + return NaN; + } +} diff --git a/api/routes/TimezonesRoute.ts b/api/routes/TimezonesRoute.ts index 32daab6..3fa86cb 100644 --- a/api/routes/TimezonesRoute.ts +++ b/api/routes/TimezonesRoute.ts @@ -1,14 +1,14 @@ -import express, { Request, Response } from 'express'; +import { Request, Response, Router } from 'express'; -import timezones from '../assets/data/timezones.json' assert {type: 'json'}; +import timezones from '../assets/data/timezones.json'; export default class TimezonesRoute { - public readonly router = express.Router(); + public readonly router = Router(); private readonly simpleTimezones: string[]; public constructor() { this.simpleTimezones = timezones - .reduce((acc : string[], item) => { + .reduce((acc: string[], item) => { acc.push(...item.utc); return acc; }, []).filter((item, index, self) => self.indexOf(item) === index); @@ -17,11 +17,11 @@ export default class TimezonesRoute { this.router.get('/simple', (_, res) => res.type('json').send(JSON.stringify(this.simpleTimezones, null, 2))); } - private getTimezone (req: Request, res: Response): void { + private getTimezone(req: Request, res: Response): void { if (req.query.q === undefined) { return void res.type('json').send(JSON.stringify(timezones, null, 2)); } - const query = req.query.q.toString().toLowerCase(); + const query = String(req.query.q).toLowerCase(); const timeCodes = this.simpleTimezones.filter((item) => { return item.toLowerCase().includes(query); }); diff --git a/api/routes/sharp/Prisma.ts b/api/routes/sharp/Prisma.ts index 5edd2bb..7fc2d34 100644 --- a/api/routes/sharp/Prisma.ts +++ b/api/routes/sharp/Prisma.ts @@ -1,6 +1,6 @@ import { PrismaClient } from '@prisma/client'; -import { NiceLogger } from '../../Logger.js'; +import { NiceLogger } from '../../utils/logging/NiceLogger.js'; export default class Prisma { public readonly client: PrismaClient; @@ -8,6 +8,6 @@ export default class Prisma { this.client = new PrismaClient(); this.client.$connect().then(() => { this.logger.log('prisma', 'Prisma', 'Connected to Postgres'); - }).catch(e => logger.log('error', 'Prisma', e)); + }).catch((e) => logger.log('error', 'Prisma', e)); } } diff --git a/api/routes/sharp/SharpDiscord.ts b/api/routes/sharp/SharpDiscord.ts index 64bd2d0..1a5603c 100644 --- a/api/routes/sharp/SharpDiscord.ts +++ b/api/routes/sharp/SharpDiscord.ts @@ -1,7 +1,7 @@ import Eris, { Client } from 'eris'; import config from '../../config.json' assert {type: 'json'}; -import { NiceLogger } from '../../Logger.js'; +import { NiceLogger } from '../../utils/logging/NiceLogger.js'; export class SharpDiscord { private readonly client: Client; diff --git a/api/routes/sharp/managers/TextManager.ts b/api/routes/sharp/managers/TextManager.ts index 96c5c26..4db3047 100644 --- a/api/routes/sharp/managers/TextManager.ts +++ b/api/routes/sharp/managers/TextManager.ts @@ -4,9 +4,9 @@ import fs from 'fs'; import { parse } from 'pb-text-format-to-json'; import { fileURLToPath } from 'url'; -import { NiceLogger } from '../../../Logger.js'; import { DefaultOptions, InputOptions } from '../../../types/PayloadTypes.js'; import { isErrnoException } from '../../../utils/index.js'; +import { NiceLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from './Timer.js'; interface Font { @@ -36,17 +36,18 @@ export default class TextManager { public constructor(public readonly logger: NiceLogger) { this.fonts = new Map(); const fontTimer = new Timer(); - this.loadFonts().then(responseData => { + this.loadFonts().then((responseData) => { const result: unknown[] = ['Loaded', responseData.loaded.length, 'fonts.']; if (responseData.missingMeta.length > 0) result.push(responseData.missingMeta.length, chalk.yellow('fonts don\'t have METADATA.pb')); this.logger.log('info', 'TextManager', ...result, fontTimer.elapsedBlueStr); if (responseData.errors > 0) this.logger.log('error', 'TextManager', `Encountered ${responseData.errors} errors while loading fonts`); - }).catch(err => { + }).catch((err) => { this.logger.log('error', 'LoadFonts', err); }); } + public text2png(text: string, inputOptions: InputOptions = {}): Buffer { // Options const options = this.parseOptions(inputOptions); @@ -105,6 +106,7 @@ export default class TextManager { } return canvas.toBuffer(); } + private parseOptions(options: InputOptions): DefaultOptions { return { font: options.font ?? 'sans-serif', @@ -134,6 +136,7 @@ export default class TextManager { output: options.output ?? 'buffer' }; } + private getCanvasFont(parsedOptions: DefaultOptions): string { if (parsedOptions.font !== 'sans-serif') { const font = this.fonts.get(parsedOptions.font); @@ -146,6 +149,7 @@ export default class TextManager { } return `${parsedOptions.size} "${parsedOptions.font}"`; } + private *getLines(ctx: CanvasRenderingContext2D, text: string, font: string, max: Max, maxWidth?: number): IterableIterator { const lines = text.split('\n'); for (const line of lines) { @@ -180,6 +184,7 @@ export default class TextManager { } } } + private getBoundingSize(metrics: TextMetrics, max: Max): Max { const boundingSize = { left: -1 * metrics.actualBoundingBoxLeft, @@ -190,12 +195,14 @@ export default class TextManager { this.updateMaxBounding(boundingSize, max); return boundingSize; } + private updateMaxBounding(currentBounding: Max, max: Max): void { max.left = Math.max(max.left, currentBounding.left); max.right = Math.max(max.right, currentBounding.right); max.ascent = Math.max(max.ascent, currentBounding.ascent); max.descent = Math.max(max.descent, currentBounding.descent); } + private setCanvasWidth(canvas: Canvas, options: DefaultOptions, lines: LineProp[], max: Max): void { const lineHeight = max.ascent + max.descent + options.lineSpacing; const contentWidth = max.left + max.right; @@ -218,6 +225,7 @@ export default class TextManager { options.paddingTop + options.paddingBottom; } + private applyBorder(canvas: Canvas, ctx: CanvasRenderingContext2D, options: DefaultOptions): void { const hasBorder = options.borderLeftWidth !== 0 || @@ -238,6 +246,7 @@ export default class TextManager { } } } + private applyBackgroundColour(canvas: Canvas, ctx: CanvasRenderingContext2D, options: DefaultOptions): void { if (options.backgroundColor !== undefined) { ctx.fillStyle = options.backgroundColor; @@ -249,6 +258,7 @@ export default class TextManager { ); } } + private applyTextStyles(ctx: CanvasRenderingContext2D, options: DefaultOptions, font: string): void { ctx.font = font; ctx.fillStyle = options.textColor; @@ -257,6 +267,7 @@ export default class TextManager { ctx.lineWidth = options.strokeWidth; ctx.strokeStyle = options.strokeColor; } + //* Font loading private async loadFonts(): Promise { const customRes = await this.loadFontsInDir('custom/'); @@ -268,6 +279,7 @@ export default class TextManager { errors: customRes.errors + oflRes.errors + uflRes.errors }; } + private async loadFontsInDir(dir: string): Promise { const responseData: FontResponseData = { loaded: [], @@ -311,7 +323,8 @@ export default class TextManager { return responseData; } } - private validateMetadata(input: JObject): Array<{ name: string; file: string; family: string; }> { + + private validateMetadata(input: JObject): { name: string; file: string; family: string; }[] { const fonts = []; if ('name' in input && typeof input.name === 'string' && 'fonts' in input) { if (!Array.isArray(input.fonts)) @@ -334,6 +347,7 @@ export default class TextManager { } return fonts; } + public get availableFontFamilies(): Record { const familyMappedObj = [...this.fonts.values()].reduce((a: Record, font) => { if (font.family in a) { diff --git a/api/routes/sharp/replaceColor.ts b/api/routes/sharp/replaceColor.ts index fe7cab1..b6e192c 100644 --- a/api/routes/sharp/replaceColor.ts +++ b/api/routes/sharp/replaceColor.ts @@ -3,7 +3,7 @@ import { StaticPool } from 'node-worker-threads-pool'; import sharp from 'sharp'; import { fileURLToPath } from 'url'; -import Image from './managers/Image.js'; +import Image from './v1/managers/Image.js'; const THREAD_COUNT = 4; const pool = new StaticPool({ diff --git a/api/routes/SharpRoute.ts b/api/routes/sharp/v1/SharpRoute.ts similarity index 75% rename from api/routes/SharpRoute.ts rename to api/routes/sharp/v1/SharpRoute.ts index 3d17f53..7b19994 100644 --- a/api/routes/SharpRoute.ts +++ b/api/routes/sharp/v1/SharpRoute.ts @@ -1,13 +1,13 @@ import chalk from 'chalk'; -import express, { Request, Response, Router } from 'express'; +import { Request, Response, Router } from 'express'; -import config from '../config.json' assert {type: 'json'}; -import { NiceLogger } from '../Logger.js'; -import { ImageEditor } from './sharp/managers/ImageEditor.js'; -import { ImageManager } from './sharp/managers/ImageManager.js'; -import TextManager from './sharp/managers/TextManager.js'; -import Timer from './sharp/managers/Timer.js'; -import { SharpDiscord } from './sharp/SharpDiscord.js'; +import config from '../../../config.json'; +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import Timer from '../../../utils/Timer.js'; +import { SharpDiscord } from '../SharpDiscord.js'; +import { ImageEditor } from './managers/ImageEditor.js'; +import { ImageManager } from './managers/ImageManager.js'; +import TextManager from './managers/TextManager.js'; export default class SharpRoute { private readonly textManager: TextManager; @@ -15,8 +15,8 @@ export default class SharpRoute { private readonly imageManager: ImageManager; private getRequestCount = 0; public readonly router: Router; - public constructor(public readonly logger: NiceLogger, public readonly env: NodeJS.ProcessEnv) { - this.router = express.Router(); + public constructor(public readonly logger: DefaultLogger, public readonly env: NodeJS.ProcessEnv) { + this.router = Router(); this.textManager = new TextManager(logger); this.imageEditor = new ImageEditor(logger, this.textManager); @@ -30,19 +30,19 @@ export default class SharpRoute { setInterval(() => { if (this.getRequestCount === 0) return; - this.logger.log('endpoint', 'GET', chalk.whiteBright('/sharp'), `${this.getRequestCount} request last hour`); + this.logger.log.endpoint('GET', chalk.whiteBright('/sharp'), `${this.getRequestCount} request last hour`); this.getRequestCount = 0; }, 3600 * 1000); this.router.post('*', (req, res, next) => { const timer = new Timer(); res.once('close', () => { - this.logger.log('endpoint', 'POST', chalk.whiteBright('/sharp' + req.path), timer.elapsedBlueStr); + this.logger.log.endpoint('POST', chalk.whiteBright('/sharp' + req.path), timer.elapsedBlueStr); }); next(); }); //* Endpoints this.router.get('/transparent.png', (_, res) => { - void this.imageEditor.generateImage({}).then(output => { + void this.imageEditor.generateImage({}).then((output) => { res.contentType('png'); res.send(output.image.buffer); }); @@ -52,7 +52,7 @@ export default class SharpRoute { }); this.router.get('/:image', (req, res) => this.getImage(req, res)); this.router.post('/', (req, res) => { - void this.imageEditor.generateImage(req.body).then(output => { + void this.imageEditor.generateImage((req.body as JObject)).then((output) => { res.type('json').send(JSON.stringify(output.meta, null, 2)); }); }); @@ -63,6 +63,7 @@ export default class SharpRoute { //? Process a request and return an image or error object this.router.post('/process', (req, res) => this.processImage(req, res)); } + // Get image from db private getImage(req: Request, res: Response): void { try { @@ -78,13 +79,14 @@ export default class SharpRoute { res.send('An error occurred!'); } } + // Store image private storeImage(req: Request, res: Response): void { - const body = req.body; - const permanent = 'persistKey' in body && body['persistKey'] === config.persistKey; + const body = req.body as JObject; + const permanent = 'persistKey' in body && body.persistKey === config.persistKey; - void this.imageEditor.generateImage(req.body).then(output => { - void this.imageManager.saveImage(output.image, output.body, permanent).then(fileName => { + void this.imageEditor.generateImage((req.body as JObject)).then((output) => { + void this.imageManager.saveImage(output.image, output.body, permanent).then((fileName) => { const root = process.env.NODE_ENV !== 'dev' ? 'https://api.nicelink.xyz/sharp/' : 'http://localhost:' + (process.env.PORT ?? '') + '/sharp/'; res.type('json').send(JSON.stringify({ path: fileName, @@ -95,6 +97,7 @@ export default class SharpRoute { }); }); } + private async storeMultiple(req: Request, res: Response): Promise { if (!Array.isArray(req.body)) return void res.status(400).send(JSON.stringify({ @@ -104,7 +107,7 @@ export default class SharpRoute { const outputs = await Promise.all(req.body.map(async (imageBody) => { if (typeof imageBody !== 'object' || Array.isArray(imageBody) || imageBody === null) return; - const output = await this.imageEditor.generateImage(imageBody); + const output = await this.imageEditor.generateImage((imageBody as JObject)); const fileName = await this.imageManager.saveImage(output.image, output.body); return { path: fileName, @@ -113,10 +116,11 @@ export default class SharpRoute { })); res.type('json').send(JSON.stringify(outputs, null, 2)); } + // Send image private processImage(req: Request, res: Response): void { - void this.imageEditor.generateImage(req.body).then(output => { - void output.image.format().then(format => { + void this.imageEditor.generateImage((req.body as JObject)).then((output) => { + void output.image.format().then((format) => { res.type(format); if (output.image.edited) { output.image.sharp.pipe(res); diff --git a/api/routes/sharp/managers/Image.ts b/api/routes/sharp/v1/managers/Image.ts similarity index 96% rename from api/routes/sharp/managers/Image.ts rename to api/routes/sharp/v1/managers/Image.ts index b94a0b2..6fce3f8 100644 --- a/api/routes/sharp/managers/Image.ts +++ b/api/routes/sharp/v1/managers/Image.ts @@ -2,14 +2,14 @@ import sizeOf from 'buffer-image-size'; import { fileTypeFromBuffer } from 'file-type'; import sharp, { Sharp } from 'sharp'; -import { CropOption, InputBody, ReplaceColorBody } from '../../../types/index.js'; -import replaceColor from '../replaceColor.js'; +import { CropOption, InputBody, ReplaceColorBody } from '../../../../types/index.js'; +import replaceColor from '../../replaceColor.js'; export default class Image { #sharpImage?: Sharp; #width: number; #height: number; - public readonly operations: Array<{ action: keyof InputBody; data: InputBody[keyof InputBody]; }>; + public readonly operations: { action: keyof InputBody; data: InputBody[keyof InputBody]; }[]; public edited: boolean; public constructor(public readonly buffer: Buffer, public readonly preEdited = false) { const { width, height } = sizeOf(buffer); @@ -18,6 +18,7 @@ export default class Image { this.operations = []; this.edited = false; } + public async format(): Promise { return (this.edited ? (await this.sharp.metadata()).format : (await fileTypeFromBuffer(this.buffer))?.ext) ?? 'png'; } @@ -29,22 +30,28 @@ export default class Image { return this.#sharpImage = sharp(this.buffer); return this.#sharpImage; } + public set sharp(sharp: Sharp) { this.edited = true; this.#sharpImage = sharp; } + public get width(): number { return this.#width; } + public set width(width: number) { this.#width = Math.round(width); } + public get height(): number { return this.#height; } + public set height(height: number) { this.#height = Math.round(height); } + //* Methods public resize(width?: number, height?: number): this { // Don't resize if the dimensions are the same!!!!!! @@ -72,6 +79,7 @@ export default class Image { } return this; } + public crop(cropOptions?: CropOption): this { if (cropOptions === undefined) return this; @@ -99,14 +107,17 @@ export default class Image { } return this; } + public opacity(opacity = 0): void { this.sharp.removeAlpha().ensureAlpha(opacity > 1 ? opacity / 100 : opacity); this.addAction('opacity', opacity); } + public rotate(rotate = 0): void { this.sharp.rotate(rotate, { background: '#00000000' }); this.addAction('rotate', rotate); } + public flip(flip?: 1 | 2 | 3): void { if (flip === undefined) return; @@ -122,12 +133,14 @@ export default class Image { break; } } + public async replaceColor(replaceOptions?: ReplaceColorBody): Promise { if (replaceOptions === undefined) return this; await replaceColor(this, replaceOptions); return this; } + private addAction(action: T, data: K): void { this.operations.push({ action, diff --git a/api/routes/sharp/managers/ImageEditor.ts b/api/routes/sharp/v1/managers/ImageEditor.ts similarity index 96% rename from api/routes/sharp/managers/ImageEditor.ts rename to api/routes/sharp/v1/managers/ImageEditor.ts index 1b83e6e..e9a0467 100644 --- a/api/routes/sharp/managers/ImageEditor.ts +++ b/api/routes/sharp/v1/managers/ImageEditor.ts @@ -3,14 +3,14 @@ import chalk from 'chalk'; import sharp, { Blend, OverlayOptions } from 'sharp'; import getUuidByString from 'uuid-by-string'; -import { NiceLogger } from '../../../Logger.js'; -import { AlignmentModes, ChildBody, InputBody, MetaBody, OutputBody, TextBody } from '../../../types/index.js'; +import { AlignmentModes, ChildBody, InputBody, MetaBody, OutputBody, TextBody } from '../../../../types/index.js'; +import CacheManager from '../../../../utils/CacheManager.js'; +import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; +import Timer from '../../../../utils/Timer.js'; import mapBody from '../mapBody/index.js'; -import CacheManager from './CacheManager.js'; import Image from './Image.js'; import { ImageFetcher } from './ImageFetcher.js'; import TextManager from './TextManager.js'; -import Timer from './Timer.js'; interface SizeObject { width: number; @@ -27,10 +27,11 @@ export class ImageEditor { inputBody?: InputBody; meta?: MetaBody; }>; + public constructor(public readonly logger: NiceLogger, public readonly textManager: TextManager) { this.imageFetcher = new ImageFetcher(logger, 100000); //? Refresh every half hour and keep edited images cached for 6 hours - this.cache = new CacheManager({hours: 6, refresh: 0.5}); + this.cache = new CacheManager({ hours: 6, refresh: 0.5 }); } public async generateImage(inputBody: JObject): Promise { @@ -65,8 +66,8 @@ export class ImageEditor { public async fetchImage(src = '', inputBody: InputBody, meta: MetaBody): Promise { try { const cachedBuffer = this.cache.get(this.getBodyStr(inputBody)); - const buffer = cachedBuffer?.buffer - ?? await this.imageFetcher.get(src); + const buffer = cachedBuffer?.buffer ?? + await this.imageFetcher.get(src); return new Image(buffer, this.cache.get(this.getBodyStr(inputBody)) !== undefined); } catch (e: unknown) { meta.errors.push('Invalid background image'); @@ -154,6 +155,7 @@ export class ImageEditor { } return image; } + //* Operations private async cropCircle(image: Image): Promise { const { width, height } = image; @@ -187,13 +189,14 @@ export class ImageEditor { blend: 'dest-in' }]); } + private async addTextImages(image: Image, textObjects: TextBody[]): Promise { - const textArray: Array<{ buffer: Buffer; body: TextBody; }> = []; + const textArray: { buffer: Buffer; body: TextBody; }[] = []; for (const textObject of textObjects) { const textObjectMaxWidth = { ...textObject, maxWidth: textObject.maxWidth ?? image.width }; const cachedBuffer = this.cache.get(this.getBodyStr(textObjectMaxWidth, 'text')); - const textBuffer = cachedBuffer?.buffer - ?? this.textManager.text2png(textObject.text ?? '', textObjectMaxWidth); + const textBuffer = cachedBuffer?.buffer ?? + this.textManager.text2png(textObject.text ?? '', textObjectMaxWidth); this.cache.set(this.getBodyStr(textObjectMaxWidth), { buffer: textBuffer @@ -204,7 +207,7 @@ export class ImageEditor { }); } - const overlayOptions = await Promise.all(textArray.map(async text => { + const overlayOptions = await Promise.all(textArray.map(async (text) => { const overlayOption = { input: text.buffer, left: 0, @@ -231,6 +234,7 @@ export class ImageEditor { })); return overlayOptions; } + private async addChildImages(image: Image, childObjects: ChildBody[], meta: MetaBody): Promise { const childArray: OverlayOptions[] = []; for (const childObject of childObjects) { @@ -280,6 +284,7 @@ export class ImageEditor { } return childArray; } + private compositeImages(image: Image, compositeOptions: OverlayOptions[]): void { image.sharp.composite(compositeOptions); } @@ -323,6 +328,7 @@ export class ImageEditor { } return alignCoords; } + // can fit without the child image being outside the parent in any way private canImageFit(parentDimensions: SizeObject, childDimensions: SizeObject): boolean { if (childDimensions.width > parentDimensions.width) @@ -331,6 +337,7 @@ export class ImageEditor { return false; return true; } + private fitImage(fitDimensions: SizeObject, image: Image, offset: Coords, alignOffset: Coords): Image { const [left, top] = [alignOffset.x + offset.x, alignOffset.y + offset.y]; const cropRegion = { @@ -351,6 +358,7 @@ export class ImageEditor { } return image.crop(cropRegion); } + private getBlendMode(blendMode?: string): Blend { /* SHARP clear, source, over, in, out, atop, dest, dest-over, dest-in, dest-out, @@ -407,6 +415,7 @@ export class ImageEditor { return 'over'; } } + private getBodyStr(body: InputBody | TextBody, type?: 'text'): string { const ignoreProps = { cacheDuration: undefined, alignment: undefined, x: undefined, y: undefined, blendMode: undefined, size: undefined }; switch (type) { @@ -420,5 +429,4 @@ export class ImageEditor { Object.assign({ ...body }, ignoreProps) )); } - } diff --git a/api/routes/sharp/managers/ImageFetcher.ts b/api/routes/sharp/v1/managers/ImageFetcher.ts similarity index 91% rename from api/routes/sharp/managers/ImageFetcher.ts rename to api/routes/sharp/v1/managers/ImageFetcher.ts index 6ed3bfb..1b76d0d 100644 --- a/api/routes/sharp/managers/ImageFetcher.ts +++ b/api/routes/sharp/v1/managers/ImageFetcher.ts @@ -3,10 +3,10 @@ import fetch from 'node-fetch'; import path from 'path'; import * as url from 'url'; -import { NiceLogger } from '../../../Logger.js'; -import CacheManager from './CacheManager.js'; +import CacheManager from '../../../../utils/CacheManager.js'; +import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; -const assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', 'assets', 'img'); +const assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', 'assets', 'img'); const transparentImagePath = path.join(assetsPath, 'transparent.png'); const circleImagePath = path.join(assetsPath, 'circle-image.png'); const blackImagePath = path.join(assetsPath, 'black.png'); @@ -37,9 +37,11 @@ export class ImageFetcher { this.store(src, buffer); return buffer; } + private store(src: string, buffer: Buffer): void { this.cache.set(src, { buffer }); } + public async load(src: string): Promise { try { const arrayBuffer = await (await fetch(src)).arrayBuffer(); @@ -48,12 +50,15 @@ export class ImageFetcher { throw Error('Invalid image'); } } + public get defaultImageBuffer(): Buffer { return this._defaultImageBuffer; } + public get circleMaskImage(): Buffer { return this._circleImageBuffer; } + public get blackImage(): Buffer { return this._blackImageBuffer; } diff --git a/api/routes/sharp/managers/ImageManager.ts b/api/routes/sharp/v1/managers/ImageManager.ts similarity index 91% rename from api/routes/sharp/managers/ImageManager.ts rename to api/routes/sharp/v1/managers/ImageManager.ts index 3ebe3b3..837e47b 100644 --- a/api/routes/sharp/managers/ImageManager.ts +++ b/api/routes/sharp/v1/managers/ImageManager.ts @@ -5,25 +5,24 @@ import path from 'path'; import { fileURLToPath } from 'url'; import { v4 as uuidv4 } from 'uuid'; -import { NiceLogger } from '../../../Logger.js'; -import { InputBody } from '../../../types/PayloadTypes.js'; -import { guard } from '../../../utils/guard/index.js'; -import Prisma from '../Prisma.js'; -import CacheManager from './CacheManager.js'; +import { InputBody } from '../../../../types/PayloadTypes.js'; +import CacheManager from '../../../../utils/CacheManager.js'; +import { guard } from '../../../../utils/guard/index.js'; +import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; +import Prisma from '../../Prisma.js'; import Image from './Image.js'; import { ImageEditor } from './ImageEditor.js'; export class ImageManager { private readonly cache: CacheManager<{ buffer: Buffer; }>; //private readonly cache: CachedImages = {}; - private readonly awaitingSharpBuffer: { - [index: string]: Promise; - } = {}; + private readonly awaitingSharpBuffer: Record> = {}; + private readonly prisma: PrismaClient; private readonly storedImagesPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', 'images', 'stored'); public constructor(public readonly editor: ImageEditor, public readonly logger: NiceLogger) { this.prisma = new Prisma(logger).client; - this.cache = new CacheManager({refresh: 6, hours: 48}); + this.cache = new CacheManager({ refresh: 6, hours: 48 }); this.startImageSweep(); } @@ -34,6 +33,7 @@ export class ImageManager { return fileName; } + public async saveImage(image: Image, body?: InputBody, persist = false): Promise { let fileType: string; if (image.edited) { @@ -54,11 +54,12 @@ export class ImageManager { this.writeFile(image.buffer, fileName); } if (body !== undefined) - this.saveImageToDB(fileName, body, persist).catch(err => { + this.saveImageToDB(fileName, body, persist).catch((err) => { this.logger.log('error', 'ImageManager', err); }); return fileName; } + public async saveImageToDB(fileName: string, body?: InputBody, persist = false): Promise { const cache_duration = body?.cacheDuration ?? 7; await this.prisma.image.create({ @@ -72,6 +73,7 @@ export class ImageManager { } }); } + public async saveBuffer(buffer: Buffer): Promise { const fileType = await fileTypeFromBuffer(buffer); const fileName = uuidv4() + '.' + (fileType?.ext ?? 'png'); @@ -79,21 +81,26 @@ export class ImageManager { this.writeFile(buffer, fileName); return fileName; } + public hasFile(fileName: string): boolean { return fs.existsSync(path.join(this.storedImagesPath, fileName)); } + public hasLegacyFile(fileName: string): boolean { return fs.existsSync(path.join(this.storedImagesPath, '..', 'images', 'legacy', fileName)); } + public writeFile(buffer: Buffer, fileName: string): void { fs.writeFile(path.join(this.storedImagesPath, fileName), buffer, (err) => { if (err !== null) return this.logger.log('error', 'ImageManager', err); }); } + public deleteFile(fileName: string): void { fs.rmSync(path.join(this.storedImagesPath, fileName)); } + public async getImage(fileName: string): Promise { if (guard.hasProperty(this.awaitingSharpBuffer, fileName)) await this.awaitingSharpBuffer[fileName]; @@ -129,16 +136,17 @@ export class ImageManager { } } + public updateLastAccessed(fileName: string): void { this.prisma.image.findUnique({ where: { id: fileName } - }).then(image => { + }).then((image) => { if (image === null) this.saveImageToDB(fileName).then(() => { this.logger.log('db', 'Prisma', 'Saved (legacy) image to DB'); - }).catch(err => { + }).catch((err) => { this.logger.log('db', 'Prisma', err); }); else @@ -154,6 +162,7 @@ export class ImageManager { }); this.cache.refreshTimestamp(fileName); } + private startImageSweep(): void { setInterval(() => void this.sweepImages(), 24 * 3600 * 1000); // Do an image sweep 1 minute after starting @@ -173,11 +182,11 @@ export class ImageManager { if (result.length > 0) this.logger.log('db', 'Prisma', 'D' + result.join(' and d')); - this.prisma.image.count().then(prismaCount => { + this.prisma.image.count().then((prismaCount) => { fs.readdir(this.storedImagesPath, undefined, (_, files) => { this.logger.log('db', 'Prisma', `Currently storing ${files.length} images on disk and ${prismaCount} in Prisma`); }); - }).catch(err => this.logger.log('error', 'ImageManager', err)); + }).catch((err) => this.logger.log('error', 'ImageManager', err)); } private async sweepFsImages(): Promise { @@ -191,7 +200,7 @@ export class ImageManager { not: true } } - })).filter(image => { + })).filter((image) => { return Date.now() > image.last_accessed.getMilliseconds() + image.cache_duration * 24 * 3600 * 1000; }); for (const image of expiredImages) { @@ -218,7 +227,7 @@ export class ImageManager { not: true } } - })).filter(image => { + })).filter((image) => { return Date.now() > image.last_accessed.getMilliseconds() + image.cache_duration * 24 * 3600 * 1000 + 90 * 86400 * 1000; }); diff --git a/api/routes/sharp/v1/managers/TextManager.ts b/api/routes/sharp/v1/managers/TextManager.ts new file mode 100644 index 0000000..f1d57e8 --- /dev/null +++ b/api/routes/sharp/v1/managers/TextManager.ts @@ -0,0 +1,362 @@ +import can, { Canvas, CanvasRenderingContext2D } from 'canvas'; +import chalk from 'chalk'; +import fs from 'fs'; +import { parse } from 'pb-text-format-to-json'; +import { fileURLToPath } from 'url'; + +import { DefaultOptions, InputOptions } from '../../../../types/PayloadTypes.js'; +import { isErrnoException } from '../../../../utils/index.js'; +import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; +import Timer from '../../../../utils/Timer.js'; + +interface Font { + name: string; + path: string; + family: string; + registered?: true; +} +interface FontResponseData { + loaded: string[]; + missingMeta: string[]; + errors: number; +} +interface Max { + left: number; + right: number; + ascent: number; + descent: number; +} +interface LineProp extends Max { + line: string; +} +export default class TextManager { + private readonly fonts: Map; + private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../assets/fonts/'; + + public constructor(public readonly logger: NiceLogger) { + this.fonts = new Map(); + const fontTimer = new Timer(); + this.loadFonts().then((responseData) => { + const result: unknown[] = ['Loaded', responseData.loaded.length, 'fonts.']; + if (responseData.missingMeta.length > 0) + result.push(responseData.missingMeta.length, chalk.yellow('fonts don\'t have METADATA.pb')); + this.logger.log('info', 'TextManager', ...result, fontTimer.elapsedBlueStr); + if (responseData.errors > 0) + this.logger.log('error', 'TextManager', `Encountered ${responseData.errors} errors while loading fonts`); + }).catch((err) => { + this.logger.log('error', 'LoadFonts', err); + }); + } + + public text2png(text: string, inputOptions: InputOptions = {}): Buffer { + // Options + const options = this.parseOptions(inputOptions); + // Register a custom font + + const font = this.getCanvasFont(options); + const canvas = new Canvas(100, 100, 'image'); + const ctx = canvas.getContext('2d'); + + const max = { + left: 0, + right: 0, + ascent: 0, + descent: 0 + }; + const lines = [...this.getLines(ctx, text, font, max, options.maxWidth)]; + + this.setCanvasWidth(canvas, options, lines, max); + + this.applyBorder(canvas, ctx, options); + this.applyBackgroundColour(canvas, ctx, options); + this.applyTextStyles(ctx, options, font); + + const lineHeight = max.ascent + max.descent + options.lineSpacing; + let offsetY = options.borderTopWidth + options.paddingTop; + for (const lineProp of lines) { + let x = 0; + const y = max.ascent + offsetY; + + // Calculate X + switch (options.textAlign) { + case 'left': + x = lineProp.left + options.borderLeftWidth + options.paddingLeft; + break; + + case 'right': + x = + canvas.width - + lineProp.left - + options.borderRightWidth - + options.paddingRight; + break; + + case 'center': + x = (max.left + max.right) / 2 + options.borderLeftWidth + options.paddingLeft; + break; + } + + if (options.strokeWidth > 0) { + ctx.strokeText(lineProp.line, x, y); + } + + ctx.fillText(lineProp.line, x, y); + + offsetY += lineHeight; + } + return canvas.toBuffer(); + } + + private parseOptions(options: InputOptions): DefaultOptions { + return { + font: options.font ?? 'sans-serif', + size: options.size ?? '30px', + textAlign: options.textAlign ?? 'left', + textColor: options.textColor ?? options.color ?? 'black', + backgroundColor: options.bgColor ?? options.backgroundColor, + lineSpacing: options.lineSpacing ?? 0, + maxWidth: options.maxWidth ?? undefined, + strokeWidth: options.strokeWidth ?? 0, + strokeColor: options.strokeColor ?? 'white', + + paddingLeft: options.paddingLeft ?? options.padding ?? 0, + paddingTop: options.paddingTop ?? options.padding ?? 0, + paddingRight: options.paddingRight ?? options.padding ?? 0, + paddingBottom: options.paddingBottom ?? options.padding ?? 0, + + borderLeftWidth: options.borderLeftWidth ?? options.borderWidth ?? 0, + borderTopWidth: options.borderTopWidth ?? options.borderWidth ?? 0, + borderBottomWidth: options.borderBottomWidth ?? options.borderWidth ?? 0, + borderRightWidth: options.borderRightWidth ?? options.borderWidth ?? 0, + borderColor: options.borderColor ?? 'black', + + localFontName: options.localFontName, + localFontPath: options.localFontPath, + + output: options.output ?? 'buffer' + }; + } + + private getCanvasFont(parsedOptions: DefaultOptions): string { + if (parsedOptions.font !== 'sans-serif') { + const font = this.fonts.get(parsedOptions.font); + if (font === undefined) + parsedOptions.font = 'sans-serif'; + else if (font.registered !== true) { + can.registerFont(font.path, { family: font.name }); + this.fonts.set(font.name, { ...font, registered: true }); + } + } + return `${parsedOptions.size} "${parsedOptions.font}"`; + } + + private *getLines(ctx: CanvasRenderingContext2D, text: string, font: string, max: Max, maxWidth?: number): IterableIterator { + const lines = text.split('\n'); + for (const line of lines) { + if (maxWidth !== undefined) { + ctx.font = font; + let str = ''; + for (const char of line) { + const metrics = ctx.measureText(str + char); + if (metrics.width <= maxWidth) { + str += char; + } else { + yield { + line: str, + ...this.getBoundingSize(metrics, max) + }; + str = char; + } + } + if (str !== '') { + const metrics = ctx.measureText(str); + yield { + line: str, + ...this.getBoundingSize(metrics, max) + }; + } + } else { + const metrics = ctx.measureText(line); + yield { + line, + ...this.getBoundingSize(metrics, max) + }; + } + } + } + + private getBoundingSize(metrics: TextMetrics, max: Max): Max { + const boundingSize = { + left: -1 * metrics.actualBoundingBoxLeft, + right: metrics.actualBoundingBoxRight, + ascent: metrics.actualBoundingBoxAscent, + descent: metrics.actualBoundingBoxDescent + }; + this.updateMaxBounding(boundingSize, max); + return boundingSize; + } + + private updateMaxBounding(currentBounding: Max, max: Max): void { + max.left = Math.max(max.left, currentBounding.left); + max.right = Math.max(max.right, currentBounding.right); + max.ascent = Math.max(max.ascent, currentBounding.ascent); + max.descent = Math.max(max.descent, currentBounding.descent); + } + + private setCanvasWidth(canvas: Canvas, options: DefaultOptions, lines: LineProp[], max: Max): void { + const lineHeight = max.ascent + max.descent + options.lineSpacing; + const contentWidth = max.left + max.right; + const contentHeight = + lineHeight * lines.length - + options.lineSpacing - + (max.descent - lines[lines.length - 1].descent); + + canvas.width = + contentWidth + + options.borderLeftWidth + + options.borderRightWidth + + options.paddingLeft + + options.paddingRight; + + canvas.height = + contentHeight + + options.borderTopWidth + + options.borderBottomWidth + + options.paddingTop + + options.paddingBottom; + } + + private applyBorder(canvas: Canvas, ctx: CanvasRenderingContext2D, options: DefaultOptions): void { + const hasBorder = + options.borderLeftWidth !== 0 || + options.borderTopWidth !== 0 || + options.borderRightWidth !== 0 || + options.borderBottomWidth !== 0; + + if (hasBorder) { + ctx.fillStyle = options.borderColor; + ctx.fillRect(0, 0, canvas.width, canvas.height); + if (options.backgroundColor === undefined) { + ctx.clearRect( + options.borderLeftWidth, + options.borderTopWidth, + canvas.width - (options.borderLeftWidth + options.borderRightWidth), + canvas.height - (options.borderTopWidth + options.borderBottomWidth) + ); + } + } + } + + private applyBackgroundColour(canvas: Canvas, ctx: CanvasRenderingContext2D, options: DefaultOptions): void { + if (options.backgroundColor !== undefined) { + ctx.fillStyle = options.backgroundColor; + ctx.fillRect( + options.borderLeftWidth, + options.borderTopWidth, + canvas.width - (options.borderLeftWidth + options.borderRightWidth), + canvas.height - (options.borderTopWidth + options.borderBottomWidth) + ); + } + } + + private applyTextStyles(ctx: CanvasRenderingContext2D, options: DefaultOptions, font: string): void { + ctx.font = font; + ctx.fillStyle = options.textColor; + ctx.antialias = 'gray'; + ctx.textAlign = options.textAlign; + ctx.lineWidth = options.strokeWidth; + ctx.strokeStyle = options.strokeColor; + } + + //* Font loading + private async loadFonts(): Promise { + const customRes = await this.loadFontsInDir('custom/'); + const oflRes = await this.loadFontsInDir('google/ofl/'); + const uflRes = await this.loadFontsInDir('google/ufl/'); + return { + loaded: customRes.loaded.concat(oflRes.loaded, uflRes.loaded), + missingMeta: customRes.missingMeta.concat(oflRes.missingMeta, uflRes.loaded), + errors: customRes.errors + oflRes.errors + uflRes.errors + }; + } + + private async loadFontsInDir(dir: string): Promise { + const responseData: FontResponseData = { + loaded: [], + missingMeta: [], + errors: 0 + }; + const fullDir = this.FONTS_ASSETS_DIR + dir; + try { + const fontDirs = await fs.promises.readdir(fullDir); + for (const fontDir of fontDirs) { + const stats = await fs.promises.stat(fullDir + fontDir); + if (!stats.isDirectory()) + continue; + try { + const metaFile = await fs.promises.readFile(fullDir + fontDir + '/' + 'METADATA.pb', 'utf-8'); + const parsedMeta = parse(metaFile); + if ('error' in parsedMeta) { //TODO More info with regards to error + responseData.errors += 1; + continue; + } + const fonts = this.validateMetadata(parsedMeta); + for (const font of fonts) { + this.fonts.set(font.name, { + name: font.name, + path: fullDir + fontDir + '/' + font.file, + family: font.family + }); + responseData.loaded.push(font.name); + } + } catch (err: unknown) { + if (isErrnoException(err)) { + if (err.code === 'ENOENT') + responseData.missingMeta.push(dir + fontDir); + } + } + } + return responseData; + } catch (err: unknown) { + this.logger.log('error', 'LoadFonts', err); + responseData.errors += 1; + return responseData; + } + } + + private validateMetadata(input: JObject): { name: string; file: string; family: string; }[] { + const fonts = []; + if ('name' in input && typeof input.name === 'string' && 'fonts' in input) { + if (!Array.isArray(input.fonts)) + input.fonts = [input.fonts]; + + if (Array.isArray(input.fonts)) { + for (const font of input.fonts) { + if (typeof font !== 'object' || font === null) + continue; + + if ('filename' in font && 'full_name' in font) + if (typeof font.filename === 'string' && typeof font.full_name === 'string') + fonts.push({ + name: font.full_name, + file: font.filename, + family: input.name + }); + } + } + } + return fonts; + } + + public get availableFontFamilies(): Record { + const familyMappedObj = [...this.fonts.values()].reduce((a: Record, font) => { + if (font.family in a) { + a[font.family].push(font.name); + } else { + a[font.family] = [font.name]; + } + return a; + }, {}); + return familyMappedObj; + } +} diff --git a/api/routes/sharp/mapBody/bodyMappings.ts b/api/routes/sharp/v1/mapBody/bodyMappings.ts similarity index 91% rename from api/routes/sharp/mapBody/bodyMappings.ts rename to api/routes/sharp/v1/mapBody/bodyMappings.ts index 9f3d202..7eb2cd9 100644 --- a/api/routes/sharp/mapBody/bodyMappings.ts +++ b/api/routes/sharp/v1/mapBody/bodyMappings.ts @@ -1,4 +1,4 @@ -import { mapping } from '../../../utils/mapping/index.js'; +import { mapping } from '../../../../utils/mapping/index.js'; export const body = { cacheDuration: mapping.number.optional, @@ -20,7 +20,7 @@ export const child = { mask: mapping.boolean.optional, x: mapping.number.optional, y: mapping.number.optional, - alignment: mapping.in('top-left', 'top-middle', 'top-right', 'left', 'center', 'right', 'bot-left', 'bot-middle', 'bot-right').optional, + alignment: mapping.choice(mapping.in('top-left', 'top-middle', 'top-right', 'left', 'center', 'right', 'bot-left', 'bot-middle', 'bot-right')).optional, blendMode: mapping.string.optional, ...body }; diff --git a/api/routes/sharp/mapBody/index.ts b/api/routes/sharp/v1/mapBody/index.ts similarity index 97% rename from api/routes/sharp/mapBody/index.ts rename to api/routes/sharp/v1/mapBody/index.ts index acb2148..dd38fe0 100644 --- a/api/routes/sharp/mapBody/index.ts +++ b/api/routes/sharp/v1/mapBody/index.ts @@ -1,5 +1,5 @@ -import { ChildBody, CropOption, InputBody, MetaBody, ResizeOption, TextBody } from '../../../types/index.js'; -import { guard } from '../../../utils/guard/index.js'; +import { ChildBody, CropOption, InputBody, MetaBody, ResizeOption, TextBody } from '../../../../types/index.js'; +import { guard } from '../../../../utils/guard/index.js'; import * as propertyMapping from './bodyMappings.js'; const propertyAliases = { @@ -137,7 +137,6 @@ function mapCropBody(cropOption: JToken, meta: MetaBody): CropOption | undefined } } else if (typeof cropOption === 'object' && !Array.isArray(cropOption) && cropOption !== null) { mappedCropOption = {}; - cropOption = convertAliases(cropOption); for (const key of Object.keys(cropOption)) { if (!guard.hasProperty(propertyMapping.crop, key)) continue; @@ -188,7 +187,6 @@ function mapResizeBody(resizeOption: JToken, meta: MetaBody): ResizeOption | und if (typeof resizeOption !== 'object' || Array.isArray(resizeOption) || resizeOption === null) return; const mappedObject: ResizeOption = {}; - resizeOption = convertAliases(resizeOption); for (const key of Object.keys(resizeOption)) { let value = resizeOption[key]; if (!guard.hasProperty(propertyMapping.resize, key)) { diff --git a/api/routes/sharp/v2/Context.ts b/api/routes/sharp/v2/Context.ts new file mode 100644 index 0000000..a95a423 --- /dev/null +++ b/api/routes/sharp/v2/Context.ts @@ -0,0 +1,75 @@ +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import Image from './Image.js'; +import { GenericOperation, UnknownOperation } from './Operation.js'; + +export type CompletedOperation = SuccessOperation | ErrorOperation | WarningOperation; + +export type SuccessOperation = GenericOperation & { + duration?: number; + buffer: Buffer; +} +export type ErrorOperation = Omit & { + error: string; +} +export type WarningOperation = SuccessOperation & { + warning: string; +} + +interface ContextObject { + ops: Omit[]; + warnings: Omit[]; + errors: ErrorOperation[]; +} +export default class Context { + public operations: CompletedOperation[] = []; + public constructor(public readonly logger: DefaultLogger, public readonly image: Image) { + + } + + public addOperationError(operation: UnknownOperation, error: string, duration = 0): void { + this.operations.push({ + ...operation, + duration, + error + }); + } + + public addOperationWarning(operation: UnknownOperation, buffer: Buffer, warning: string, duration = 0): void { + this.operations.push({ + ...operation, + buffer, + duration, + warning + }); + } + + public addOperation(operation: UnknownOperation, buffer: Buffer, duration: number): void { + this.operations.push({ ...operation, buffer, duration }); + } + + public toJSON(): ContextObject { + const warnings = this.operations.filter((e): e is WarningOperation => 'warning' in e).map((e) => { + return { + type: e.type, + data: e.data, + warning: e.warning + }; + }); + const errors = this.operations.filter((e): e is ErrorOperation => 'error' in e).map((e) => { + return { + type: e.type, + data: e.data, + error: e.error + }; + }); + return { + ops: this.operations.map((e) => Object.assign({}, e, { buffer: undefined })), + warnings: warnings, + errors: errors + }; + } + + public getAppliedOperations(): (SuccessOperation )[] { + return this.operations.filter((e): e is SuccessOperation => !('error' in e)); + } +} diff --git a/api/routes/sharp/v2/Image.ts b/api/routes/sharp/v2/Image.ts new file mode 100644 index 0000000..26435d3 --- /dev/null +++ b/api/routes/sharp/v2/Image.ts @@ -0,0 +1,73 @@ +import sizeOf from 'buffer-image-size'; +import sharp, { Sharp } from 'sharp'; +import { v4 as uuidv4 } from 'uuid'; + +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import Context from './Context.js'; + +export default class Image { + public readonly context: Context; + public readonly id: string; + + #sharp: Sharp; + #width: number; + #height: number; + + public constructor(public readonly logger: DefaultLogger, buffer: Buffer, public readonly background: string) { + + this.context = new Context(logger, this); + this.id = uuidv4(); + + const { width, height } = sizeOf(buffer); + this.#width = width; + this.#height = height; + + this.#sharp = sharp(buffer); + } + + public get sharp(): Sharp { + return this.#sharp; + } + + public set sharp(newSharp: Sharp) { + this.#sharp = newSharp; + } + + public get width(): number { + return this.#width; + } + + public set width(width: number) { + this.#width = width; + } + + public get height(): number { + return this.#height; + } + + public set height(height: number) { + this.#height = height; + } + + public async updateBuffer(): Promise { + const newBuffer = await this.#sharp.toBuffer(); + this.#sharp = sharp(newBuffer); + return newBuffer; + } + + public setBuffer(buffer: Buffer): void { + this.#sharp = sharp(buffer); + // Update dimensions + this.setDimensions(buffer); + } + + private setDimensions(buffer: Buffer): void { + const { width, height } = sizeOf(buffer); + this.#width = width; + this.#height = height; + } + + public async getFormat(defaultFormat = 'png'): Promise { + return (await this.#sharp.metadata()).format ?? defaultFormat; + } +} diff --git a/api/routes/sharp/v2/Operation.ts b/api/routes/sharp/v2/Operation.ts new file mode 100644 index 0000000..3b19548 --- /dev/null +++ b/api/routes/sharp/v2/Operation.ts @@ -0,0 +1,101 @@ +import chalk from 'chalk'; + +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../utils/mapping/index.js'; +import Timer from '../../../utils/Timer.js'; +import { TypeMappingResult } from '../../../utils/types.js'; +import Context from './Context.js'; +import Image from './Image.js'; + +type DataMap = (value: unknown) => TypeMappingResult + +export type IGeneralOperation = new (logger: DefaultLogger) => IOperation; + +export interface IOperation { + name: string; + aliases: string[]; + execute: (image: Image, data: unknown) => Promise; + validateData: (ctx: Context, data: unknown) => unknown; +} + +interface OperationInfo { + name: string; + aliases?: string[]; + mapping: DataMap; + execute: (image: Image, data: T) => Promise | Image; + dataPropertyAliases?: Record; +} + +export interface GenericOperation { + type: T; + data: D; +} + +export interface UnknownOperation { + type: string; + data: unknown; +} + +export default class Operation implements IOperation { + public readonly name: string; + public readonly aliases: string[]; + public readonly dataPropertyAliases?: Record; + public readonly mapping: DataMap; + + #execute: (image: Image, data: OpData) => Promise | Image; + + public constructor(public readonly logger: DefaultLogger, operation: OperationInfo) { + this.name = operation.name; + this.dataPropertyAliases = operation.dataPropertyAliases; + this.aliases = operation.aliases ?? []; + + this.mapping = operation.mapping; + this.#execute = operation.execute; + } + + private convertAliases(_: Context, data: unknown, aliases: Record | undefined): unknown { + if (aliases !== undefined) { + const objectMapping = mapping.jObject(data); + if (objectMapping.valid) { + for (const key of Object.keys(objectMapping.value)) { + if (key in aliases) { + objectMapping.value[aliases[key]] = objectMapping.value[key]; + delete objectMapping.value[key]; + } + } + return objectMapping.value; + } + } + return data; + } + + public validateData(_: Context, data: unknown): OpData | void { + const validatedData = this.mapping(this.convertAliases(_, data, this.dataPropertyAliases)); + + if (!validatedData.valid) + return; + return validatedData.value; + } + + public async execute(image: Image, data: unknown): Promise { + const opTimer = new Timer(true); + const validatedData = this.validateData(image.context, data); + if (validatedData === undefined) { + image.context.addOperationError({ type: this.name, data }, 'Invalid data', 0); + return image; + } + + try { + const imageAfter = await this.#execute(image, validatedData); + const newBuffer = await image.updateBuffer(); + image.context.addOperation({ + type: this.name, + data: validatedData + }, newBuffer, Number(opTimer.elapsedMS)); + return imageAfter; + } catch (err: unknown) { + this.logger.log.operation(chalk.red(`${this.name} UNCAUGHT ERROR:`), err); + return image; + } + } +} diff --git a/api/routes/sharp/v2/OperationHandler.ts b/api/routes/sharp/v2/OperationHandler.ts new file mode 100644 index 0000000..71d7c24 --- /dev/null +++ b/api/routes/sharp/v2/OperationHandler.ts @@ -0,0 +1,198 @@ +import chalk from 'chalk'; +import fs from 'fs'; +import _ from 'lodash'; +import { fileURLToPath } from 'url'; + +import { guard } from '../../../utils/guard/index.js'; +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import Context, { SuccessOperation } from './Context.js'; +import Image from './Image.js'; +import Operation, { IGeneralOperation, IOperation } from './Operation.js'; +import { CachedOperation } from './services/ImageEditor.js'; +import { ValidInputObject } from './validateInput.js'; + +interface ExportObj { + default: unknown; +} +const operationPath = fileURLToPath(new URL('.', import.meta.url)) + '/operations/'; + +export default class OperationHandler { + private readonly cache: Record = {}; + private readonly operations = new Map(); + + public constructor(public readonly logger: DefaultLogger) { + void this.initOperations(); + } + + public getOperation(context: Context, inputOperation: JObject): IOperation | undefined { + // Maybe remove the errors from this + if (!guard.hasProperty(inputOperation, 'type') || typeof inputOperation.type !== 'string') { + this.logger.log.operation(chalk.red('Invalid operation object:'), chalk.red.bold(JSON.stringify(inputOperation))); + context.addOperationError({ + type: 'unknown', + data: inputOperation + }, 'Invalid operation object'); + return; + } + const operation = this.operations.get(inputOperation.type); + if (operation === undefined) { + this.logger.log.operation(chalk.red('Invalid operation type:'), chalk.red.bold(inputOperation.type)); + context.addOperationError({ + type: inputOperation.type, + data: inputOperation + }, 'Invalid operation type', Number(inputOperation.elapsedMS)); + return; + } + return operation; + } + + public getBuffer(image: Image, input: ValidInputObject): { buffer: Buffer; remainingOperations: JObject[]; } | undefined { + if (!(input.background in this.cache)) + return; + let remainingOperations: JObject[] = input.operations; + // The cached operation that it's currently using + let currentOperation: CachedOperation | undefined; + // The array of operations that are cached + let cachedOperations = this.cache[input.background]; + let cachedUntilOperation = 0; + mainOperationLoop: + for (let i = 0; i < input.operations.length; i++) { + const operation = this.getOperation(image.context, input.operations[i]); + if (operation === undefined) + continue; + + const operationData = operation.validateData(image.context, input.operations[i].data); + if (operationData === undefined) + continue; //TODO error/warning + + const validOperationObject = { + type: operation.name, + data: operationData as JToken + }; + + for (const cachedOperation of cachedOperations) { + if (this.isEqual(validOperationObject, cachedOperation)) { + image.context.addOperation(cachedOperation, cachedOperation.buffer, 0); + currentOperation = cachedOperation; + cachedUntilOperation = i + 1; + this.logger.log.operation(operation.name, 'Using cache'); + if (cachedOperation.nextOperations === undefined) { + break mainOperationLoop; + } + cachedOperations = cachedOperation.nextOperations; + continue mainOperationLoop; + } + } + cachedUntilOperation = i; + break mainOperationLoop; + } + remainingOperations = input.operations.slice(cachedUntilOperation); + + return currentOperation !== undefined ? { + buffer: currentOperation.buffer, + remainingOperations + } : undefined; + } + + public cacheOperations(image: Image): void { + const appliedOperations = image.context.getAppliedOperations(); + if (!(image.background in this.cache)) + this.cache[image.background] = []; + + // The cached operation that it's currently using + let currentOperation: CachedOperation | undefined; + // The array of operations that are cached + let cachedOperations = this.cache[image.background]; + let newOperations = 0; + + mainOperationLoop: + for (const operation of appliedOperations) { + if (cachedOperations.length !== 0) { + for (const cachedOperation of cachedOperations) + if (this.isEqual(operation, cachedOperation)) { + currentOperation = cachedOperation; + cachedOperations = cachedOperation.nextOperations ?? []; + continue mainOperationLoop; + } + } + newOperations++; + if (currentOperation !== undefined) { + cachedOperations = []; + if (currentOperation.nextOperations === undefined) + currentOperation.nextOperations = []; + currentOperation.nextOperations.push(operation); + + // Update currentOperation + currentOperation = currentOperation.nextOperations[currentOperation.nextOperations.length - 1]; + continue; + } + this.cache[image.background].push(operation); + currentOperation = operation; + } + this.logger.log.operation('OperationHandler', `Added ${newOperations} operations`); + } + + private async initOperations(): Promise { + let operationCount = 0; + const operations = await this.loadOperations(this.logger); + for (const operationClass of operations) { + const operation = new operationClass(this.logger); + if (this.operations.has(operation.name)) { + this.logger.log.error('OPERATION:', operation.name, 'already exists'); + this.logger.log.error('Cancelled loading of operations'); + break; + } + this.operations.set(operation.name, operation); + operationCount++; + if (operation.aliases.length > 0) + aliasloop: + for (const alias of operation.aliases) { + if (this.operations.has(alias)) { + this.logger.log.error(`Alias ${alias} of operation ${operation.name} already exists`); + continue aliasloop; + } + + this.operations.set(alias, operation); + } + } + this.logger.log.operation(`Initialized ${operationCount} operations`); + } + + private async loadOperations(logger: DefaultLogger): Promise { + const operations: IGeneralOperation[] = []; + const operationFiles = fs.readdirSync(operationPath); + + for (const fileName of operationFiles) { + if (!fileName.endsWith('.js')) + continue; + + await import(operationPath + fileName).then((contents: unknown) => { + //? Check if it's an object with a 'default' property + if (this.isExportObject(contents)) { + if (contents.default instanceof Operation) { + // The infamous as unknown as 'type' moment + operations.push(contents.default as unknown as IGeneralOperation); + } + } + }).catch((err) => { + logger.log.error(err); + }); + } + return operations; + } + + private isExportObject(contents: unknown): contents is ExportObj { + if (typeof contents === 'object' && !Array.isArray(contents) && contents !== null) { + return 'default' in contents; + } + return false; + } + + private isEqual(operation: JObject | (SuccessOperation), cachedOperation: CachedOperation): boolean { + return _.isEqual(this.removeCacheKeys(operation), this.removeCacheKeys(cachedOperation)); + } + + private removeCacheKeys(object: CachedOperation | JObject, include = ['type', 'data']): JObject { + return _.omit(object, Object.keys(object).filter((e) => !include.includes(e))); + } +} diff --git a/api/routes/sharp/v2/Operations.ts.disabled b/api/routes/sharp/v2/Operations.ts.disabled new file mode 100644 index 0000000..fdcd3e7 --- /dev/null +++ b/api/routes/sharp/v2/Operations.ts.disabled @@ -0,0 +1,76 @@ +// //import { mapping } from '../../../utils/mapping/index.js'; + +// export interface BaseImageObject extends ImageObject { +// cacheDuration?: number; +// } + +// export type ChildImageObject = ImageObject; + +// export interface ImageObject { +// background: string; +// operations: AnyOperation[]; +// } + +// export interface GenericOperation { +// type: T; +// data: D; +// } + +// export interface UnknownOperation { +// type: string; +// data: unknown; +// } + +// export type AnyOperation = ResizeOperation | OpacityOperation | RotateOperation | ShapeOperation | FlipOperation | CropOperation | ReplaceColorOperation | ChildOperation | InvalidOperation; + +// export type ResizeOperation = GenericOperation<'resize', {width?: number; height?: number;}> +// export type OpacityOperation = GenericOperation<'opacity', number> +// export type RotateOperation = GenericOperation<'rotate', number>; +// export type ShapeOperation = GenericOperation<'shape', 'circle'>; + +// export type FlipOperation = GenericOperation<'flip', FlipData>; +// export type CropOperation = GenericOperation<'crop', CropData>; +// export type ReplaceColorOperation = GenericOperation<'replaceColor', ReplaceColorData>; +// type FlipData = {vertical: boolean;} | {horizontal: boolean;} | {vertical: boolean; horizontal: boolean;}; +// export type CropData = 'auto' | { x?: number; y?: number; width?: number; height?: number;}; +// interface ReplaceColorData { +// target: string; +// replace: string; +// delta?: number; +// } + +// export type ChildOperation = GenericOperation<'children', ChildImageObject> + +// export type InvalidOperation = GenericOperation<'invalid_operation', unknown>; + +// // const optionalXandY = {x: mapping.number.optional, y: mapping.number.optional}; + +// // export const actionMappings = { +// // resize: mapping.choice( +// // mapping.object({width: mapping.number}), +// // mapping.object({height: mapping.number}), +// // mapping.object({width: mapping.number, height: mapping.number}) +// // ), +// // opacity: mapping.number, +// // rotate: mapping.number, +// // shape: mapping.in('circle'), +// // flip: mapping.choice( +// // mapping.object({vertical: mapping.boolean, horizontal: mapping.boolean}), +// // mapping.object({vertical: mapping.boolean}), +// // mapping.object({horizontal: mapping.boolean}) +// // ), +// // crop: mapping.choice( +// // mapping.in('auto'), +// // mapping.number, +// // mapping.choice( +// // mapping.object({width: mapping.number, height: mapping.number, ...optionalXandY}), +// // mapping.object({height: mapping.number, ...optionalXandY}), +// // mapping.object({width: mapping.number, ...optionalXandY}) +// // ) +// // ), +// // replacecolor: mapping.object({ +// // target: mapping.string, +// // replace: mapping.string, +// // delta: mapping.number.optional +// // }) +// // }; diff --git a/api/routes/sharp/v2/SharpRoute.ts b/api/routes/sharp/v2/SharpRoute.ts new file mode 100644 index 0000000..527d16e --- /dev/null +++ b/api/routes/sharp/v2/SharpRoute.ts @@ -0,0 +1,54 @@ +import { Router } from 'express'; +import fs from 'fs'; +import path from 'path'; +import sharp from 'sharp'; +import url from 'url'; + +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import Timer from '../../../utils/Timer.js'; +import ImageManager from './services/ImageManager.js'; + +const testImageBuffer = fs.readFileSync(path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', 'assets', 'img', 'testImage2.png')); + +export default class SharpRoute { + public readonly router = Router(); + public readonly manager: ImageManager; + + public constructor(public readonly logger: DefaultLogger) { + this.manager = new ImageManager(logger); + + this.router.get('/testImage.png', (_, res) => { + sharp(testImageBuffer).pipe(res); + }); + + this.router.post('/image', (req, res) => { + const body = req.body as JObject; + const timer = new Timer(true); + void this.manager.postImage(body).then(async (image) => { + this.logger.log.time('Processed image', timer.elapsedBlueStr); + timer.reset(); + switch ('responseType' in body ? body.responseType : 'image') { + case 'image': + res.type(await image.getFormat()); + image.sharp.pipe(res); + break; + default: + res.status(200).send(JSON.stringify(image.context.toJSON(), null, 2)); + break; + } + }); + res.once('close', () => { + this.logger.log.time('Request handled', timer.elapsedBlueStr); + }); + }); + //this.router.post('/image'); + // this.router.post('/', (req, res) => { + // const body = req.body; + // const timer = new Timer(true); + // }); + } + + // public parseJsonBody (req: Request, res: Response, next: NextFunction): void { + + // } +} diff --git a/api/routes/sharp/v2/operations/Crop.ts b/api/routes/sharp/v2/operations/Crop.ts new file mode 100644 index 0000000..9f6db5b --- /dev/null +++ b/api/routes/sharp/v2/operations/Crop.ts @@ -0,0 +1,46 @@ +// TODO mode: 'box' -> x,y,w,h; mode: 'auto' -> specify background https://sharp.pixelplumbing.com/api-resize#trim +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../../utils/mapping/index.js'; +import Image from '../Image.js'; +import Operation from '../Operation.js'; + +export type CropData = 'auto' | { x?: number; y?: number; width?: number; height?: number; }; + +export default class Crop extends Operation { + public constructor(public readonly logger: DefaultLogger) { + super(logger, { + name: 'crop', + mapping: mapping.choice( + mapping.guard((v): v is 'auto' => v === 'auto'), + mapping.object({ + width: mapping.number.optional, + height: mapping.number.optional, + x: mapping.number.optional, + y: mapping.number.optional + })), + execute: (image, data) => this.cropImage(image, data), + dataPropertyAliases: { + w: 'width', + h: 'height', + x: 'left', + y: 'top' + } + }); + } + + private cropImage(image: Image, data: CropData): Image { + if (data === 'auto') { + image.sharp.trim({ background: '#00000000' }); + } else { + image.sharp.extract({ + left: data.x ?? 0, + top: data.y ?? 0, + width: data.width ?? image.width, + height: data.height ?? image.height + }); + image.height = (data.y ?? 0) + (data.height ?? image.height); + image.width = (data.x ?? 0) + (data.width ?? image.width); + } + return image; + } +} diff --git a/api/routes/sharp/v2/operations/Fill.ts b/api/routes/sharp/v2/operations/Fill.ts new file mode 100644 index 0000000..0c62b4a --- /dev/null +++ b/api/routes/sharp/v2/operations/Fill.ts @@ -0,0 +1,25 @@ +import sharp from 'sharp'; + +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../../utils/mapping/index.js'; +import Operation from '../Operation.js'; + +export default class Fill extends Operation { + public constructor(public readonly logger: DefaultLogger) { + super(logger, { + name: 'fill', + mapping: mapping.string, + execute: (image, data) => { + if (image.background !== '') + return image; //TODO replace colour?? + image.sharp = sharp({ create: { + channels: 4, + background: data, + width: image.width, + height: image.height + } }).png(); + return image; + } + }); + } +} diff --git a/api/routes/sharp/v2/operations/Flip.ts b/api/routes/sharp/v2/operations/Flip.ts new file mode 100644 index 0000000..cafcc9d --- /dev/null +++ b/api/routes/sharp/v2/operations/Flip.ts @@ -0,0 +1,26 @@ +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../../utils/mapping/index.js'; +import Operation from '../Operation.js'; + +export default class Flip extends Operation<1 | 2 | 3> { + public constructor(public readonly logger: DefaultLogger) { + super(logger, { + name: 'flip', + mapping: mapping.guard((v): v is 1 | 2 | 3 => [1, 2, 3].includes(v)), + execute: (image, data) => { + switch (data) { + case 1: + image.sharp.flip(); + break; + case 2: + image.sharp.flop(); + break; + case 3: + image.sharp.flip().flop(); + break; + } + return image; + } + }); + } +} diff --git a/api/routes/sharp/v2/operations/Opacity.ts b/api/routes/sharp/v2/operations/Opacity.ts new file mode 100644 index 0000000..41eb9d4 --- /dev/null +++ b/api/routes/sharp/v2/operations/Opacity.ts @@ -0,0 +1,20 @@ +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../../utils/mapping/index.js'; +import Image from '../Image.js'; +import Operation from '../Operation.js'; + +export default class Opacity extends Operation { + public constructor(public readonly logger: DefaultLogger) { + super(logger, { + name: 'opacity', + aliases: ['o'], + mapping: mapping.number, + execute: (img, data) => this.changeOpacity(img, data) + }); + } + + private changeOpacity(image: Image, data: number): Image { + image.sharp.removeAlpha().ensureAlpha(data); + return image; + } +} diff --git a/api/routes/sharp/v2/operations/Resize.ts b/api/routes/sharp/v2/operations/Resize.ts new file mode 100644 index 0000000..124acc5 --- /dev/null +++ b/api/routes/sharp/v2/operations/Resize.ts @@ -0,0 +1,36 @@ +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../../utils/mapping/index.js'; +import Operation from '../Operation.js'; + +export interface ResizeData { + width?: number; + height?: number; +} + +export default class ResizeOperation extends Operation { + public constructor(public readonly logger: DefaultLogger) { + super(logger, { + name: 'resize', + dataPropertyAliases: { + w: 'width', + h: 'height' + }, + mapping: mapping.choice(mapping.object({ + width: mapping.number.optional, + height: mapping.number.optional + }), mapping.object({ + width: mapping.number + }), mapping.object({ + height: mapping.number + }) + ), + execute: (image, data) => { + if (image.width === (data.width ?? image.width) && image.height === (data.height ?? image.height)) + return image; + image.sharp.resize(data.width ?? null, data.height ?? null); + return image; + } + + }); + } +} diff --git a/api/routes/sharp/v2/operations/Rotate.ts b/api/routes/sharp/v2/operations/Rotate.ts new file mode 100644 index 0000000..fb007de --- /dev/null +++ b/api/routes/sharp/v2/operations/Rotate.ts @@ -0,0 +1,16 @@ +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../../utils/mapping/index.js'; +import Operation from '../Operation.js'; + +export default class Rotate extends Operation { + public constructor(public readonly logger: DefaultLogger) { + super(logger, { + name: 'rotate', + mapping: mapping.number, + execute: (image, data) => { + image.sharp.rotate(data, { background: '#00000000' }); + return image; + } + }); + } +} diff --git a/api/routes/sharp/v2/operations/Text.ts b/api/routes/sharp/v2/operations/Text.ts new file mode 100644 index 0000000..8b26050 --- /dev/null +++ b/api/routes/sharp/v2/operations/Text.ts @@ -0,0 +1,246 @@ +import sizeOf from 'buffer-image-size'; +import _ from 'lodash'; + +import { AlignmentModes, InputOptions } from '../../../../types/PayloadTypes.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { mapping } from '../../../../utils/mapping/index.js'; +import Timer from '../../../../utils/Timer.js'; +import Image from '../Image.js'; +import Operation from '../Operation.js'; +import { TextManager } from '../services/TextManager.js'; + +interface SizeObject { + width: number; + height: number; +} +interface Coords { + x: number; + y: number; +} + +const textOptions = mapping.object({ + text: mapping.string.optional, + size: mapping.string.optional, + font: mapping.string.optional, + textAlign: mapping.in('left', 'center', 'right').optional, + color: mapping.string.optional, + textColor: mapping.string.optional, + backgroundColor: mapping.string.optional, + bgColor: mapping.string.optional, + lineSpacing: mapping.number.optional, + maxWidth: mapping.number.optional, + strokeWidth: mapping.number.optional, + strokeColor: mapping.string.optional, + padding: mapping.number.optional, + paddingLeft: mapping.number.optional, + paddingRight: mapping.number.optional, + paddingTop: mapping.number.optional, + paddingBottom: mapping.number.optional, + borderWidth: mapping.number.optional, + borderLeftWidth: mapping.number.optional, + borderRightWidth: mapping.number.optional, + borderBottomWidth: mapping.number.optional, + borderTopWidth: mapping.number.optional, + borderColor: mapping.string.optional, + localFontPath: mapping.string.optional, + localFontName: mapping.string.optional, + output: mapping.in('buffer', 'stream', 'dataURL', 'canvas').optional +}); +export const textMapping = { + x: mapping.number.optional, + y: mapping.number.optional, + alignment: mapping.in('top-left', 'top-middle', 'top-right', 'left', 'center', 'right', 'bot-left', 'bot-middle', 'bot-right').optional, + options: textOptions +}; + +interface TextOperationData { + options: InputOptions; + x?: number; + y?: number; + alignment?: AlignmentModes; +} + +interface CachedText { + input: InputOptions; + buffer: Buffer; + maxWidth: number; + width: number; + height: number; + fit?: ResizedToFitData; +} + +interface ResizedToFitData { + buffer: Buffer; + maxWidth: number; + left: number; + top: number; +} + +export default class Text extends Operation { + private readonly manager: TextManager; + private readonly cache: Record = {}; + public constructor(public readonly logger: DefaultLogger) { + super(logger, { + name: 'text', + mapping: mapping.array(mapping.object({ ...textMapping })), + dataPropertyAliases: { + 'p': 'position', + 'pos': 'position', + 'o': 'options', + 'ops': 'options', + 'options[].color': 'textColor', + 'options[].bgColor': 'backgroundColor' + }, + execute: (image, data) => this.addTextImages(image, data) + }); + this.manager = new TextManager(logger); + } + + private async addTextImages(image: Image, textObjects: TextOperationData[]): Promise { + const textArray: { buffer: Buffer; data: TextOperationData; }[] = []; + for (const textObject of textObjects) { + const options = textObject.options; + const text = options.text ?? ''; + const maxWidth = options.maxWidth ?? image.width; + + this.logger.log.operation(options); + + const textPngTimer = new Timer(true); + let textBuffer: Buffer | undefined; + if (text in this.cache) { + for (const cachedText of this.cache[text]) { + if (cachedText.maxWidth >= maxWidth && cachedText.width <= maxWidth) { + if (_.isEqual(cachedText.input, options)) { + textBuffer = cachedText.buffer; + break; + } + } + } + } + if (textBuffer === undefined) { + textBuffer = this.manager.text2png(text, { ...options, maxWidth }); + if (!(text in this.cache)) + this.cache[text] = []; + const { width, height } = sizeOf(textBuffer); + + this.cache[text].push({ + input: options, + buffer: textBuffer, + maxWidth, + width, + height + }); + + } + this.logger.log.time('Text2Png', textPngTimer.elapsedBlueStr); + textArray.push({ + buffer: textBuffer, + data: textObject + }); + + } + const compositeOptions = await Promise.all(textArray.map(async (text) => { + const overlayOption = { + input: text.buffer, + left: 0, + top: 0 + }; + const { width, height } = sizeOf(text.buffer); + const alignCoords = this.getAlignCoords(image, { width, height }, text.data.alignment ?? 'top-left'); + const coords = { x: text.data.x ?? 0, y: text.data.y ?? 0 }; + const [leftOffset, topOffset] = [alignCoords.x + coords.x, alignCoords.y + coords.y]; + const parentDimensions = { width: image.width, height: image.height }; + const textDimensions = { width, height }; + + if (!this.canImageFit(parentDimensions, textDimensions)) { + this.logger.log.operation('Text', 'Cannot fit'); + overlayOption.input = await this.fitImage(parentDimensions, new Image(this.logger, text.buffer, ''), coords, alignCoords).sharp.toBuffer(); + + // If the offset is set outside the image, that region will be cropped out already so it shouldn't be offset. + if (leftOffset > 0) + overlayOption.left += leftOffset; + if (topOffset > 0) + overlayOption.top += topOffset; + } else { + overlayOption.left = leftOffset; + overlayOption.top = topOffset; + } + this.logger.log.operation(overlayOption); + return overlayOption; + })); + + image.sharp.composite(compositeOptions); + return image; + } + + private getAlignCoords(parentImage: Image, childSize: SizeObject, alignment: AlignmentModes): Coords { + const alignCoords = { + x: 0, + y: 0 + }; + switch (alignment) { + case 'top-left': + break; + case 'top-middle': + alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); + break; + case 'top-right': + alignCoords.x = parentImage.width - childSize.width; + break; + case 'left': + alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); + break; + case 'center': + alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); + alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); + break; + case 'right': + alignCoords.x = parentImage.width - childSize.width; + alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); + break; + case 'bot-left': + alignCoords.y = parentImage.height - childSize.height; + break; + case 'bot-middle': + alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); + alignCoords.y = parentImage.height - childSize.height; + break; + case 'bot-right': + alignCoords.x = parentImage.width - childSize.width; + alignCoords.y = parentImage.height - childSize.height; + break; + } + return alignCoords; + } + + //can fit without the child image being outside the parent in any way + private canImageFit(parentDimensions: SizeObject, childDimensions: SizeObject): boolean { + if (childDimensions.width > parentDimensions.width) + return false; + if (childDimensions.height > parentDimensions.height) + return false; + return true; + } + + private fitImage(fitDimensions: SizeObject, image: Image, offset: Coords, alignOffset: Coords): Image { + const [left, top] = [alignOffset.x + offset.x, alignOffset.y + offset.y]; + const cropRegion = { + width: image.width, + height: image.height, + left: 0, + top: 0 + }; + if (image.width > fitDimensions.width) { + cropRegion.width = Math.min(fitDimensions.width, image.width - Math.abs(left)); + if (left < 0) + cropRegion.left = -left; + } + if (image.height > fitDimensions.height) { + cropRegion.height = Math.min(fitDimensions.height, image.height - Math.abs(top)); + if (top < 0) + cropRegion.top = -top; + } + image.sharp.extract(cropRegion); + return image; + } +} diff --git a/api/routes/sharp/v2/operations/index.ts.disabled b/api/routes/sharp/v2/operations/index.ts.disabled new file mode 100644 index 0000000..907f739 --- /dev/null +++ b/api/routes/sharp/v2/operations/index.ts.disabled @@ -0,0 +1,25 @@ +// feels hacky, but I don't know anything else +// import CropOperation from './Crop.js'; +// import FillOperation from './Fill.js'; +// import FlipOperation from './Flip.js'; +// import OpacityOperation from './Opacity.js'; +// import ResizeOperation from './Resize.js'; +// import RotateOperation from './Rotate.js'; +// import TextOperation from './Text.js'; + +// export type AnyOperationClass = CropOperation | OpacityOperation | FlipOperation | RotateOperation | ResizeOperation | TextOperation | FillOperation + +// export const operationObject = { +// crop: CropOperation, +// opacity: OpacityOperation, +// flip: FlipOperation, +// rotate: RotateOperation, +// resize: ResizeOperation, +// text: TextOperation, +// fill: FillOperation +// }; + +// export interface GenericOperation { +// type: T; +// data: D; +// } diff --git a/api/routes/sharp/v2/services/ImageEditor.ts b/api/routes/sharp/v2/services/ImageEditor.ts new file mode 100644 index 0000000..eb2d02c --- /dev/null +++ b/api/routes/sharp/v2/services/ImageEditor.ts @@ -0,0 +1,56 @@ +//import _ from 'lodash'; + +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import Timer from '../../../../utils/Timer.js'; +import { SuccessOperation } from '../Context.js'; +import Image from '../Image.js'; +import OperationHandler from '../OperationHandler.js'; +import { validateRootInput } from '../validateInput.js'; +import ImageFetcher from './ImageFetcher.js'; + +export type CachedOperation = (SuccessOperation ) & { + nextOperations?: CachedOperation[]; +} + +export class ImageEditor { + public readonly fetcher: ImageFetcher; + public readonly operationHandler: OperationHandler; + public constructor(public readonly logger: DefaultLogger) { + this.fetcher = new ImageFetcher(logger); + this.operationHandler = new OperationHandler(logger); + } + + public async editImage(input: JObject): Promise { + const editImageTimer = new Timer(true); + const validatedInput = validateRootInput(input); + + if (validatedInput === undefined) + return new Image(this.logger, this.fetcher.defaultImageBuffer, 'invalid'); // TODO HANDLE INVALID INPUT + + const imageBuffer = await this.fetcher.fetchImage(validatedInput.background); + if (imageBuffer === undefined) + return new Image(this.logger, this.fetcher.defaultImageBuffer, 'invalid'); // TODO HANDLE INVALID BACKGROUND + + const image = new Image(this.logger, imageBuffer, validatedInput.background); + // Caching vars + const operationCache = this.operationHandler.getBuffer(image, validatedInput); + if (operationCache !== undefined) + image.setBuffer(operationCache.buffer); + + for (const inputObj of operationCache !== undefined ? operationCache.remainingOperations : validatedInput.operations) { + const opTimer = new Timer(true); + const operation = this.operationHandler.getOperation(image.context, inputObj); + if (operation === undefined) + continue; + + await operation.execute(image, inputObj.data); + this.logger.log.operation(operation.name, opTimer.elapsedBlueStr); + } + + this.operationHandler.cacheOperations(image); + this.logger.log.image('editImageTimer', editImageTimer.elapsedBlueStr); + + return image; + } + +} diff --git a/api/routes/sharp/v2/services/ImageFetcher.ts b/api/routes/sharp/v2/services/ImageFetcher.ts new file mode 100644 index 0000000..a684b0f --- /dev/null +++ b/api/routes/sharp/v2/services/ImageFetcher.ts @@ -0,0 +1,39 @@ +import fs from 'fs'; +import fetch from 'node-fetch'; +import path from 'path'; +import url from 'url'; + +import CacheManager from '../../../../utils/CacheManager.js'; +import { defaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import Timer from '../../../../utils/Timer.js'; + +const transparentImagePath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', 'assets', 'img', 'transparent.png'); + +export default class ImageFetcher { + public cache: CacheManager<{ buffer: Buffer; }>; + public readonly defaultImageBuffer = fs.readFileSync(transparentImagePath); + + public constructor(public readonly logger: typeof defaultLogger) { + this.cache = new CacheManager({ refresh: 0.5, hours: 48 }); + } + + public async fetchImage(src?: string): Promise { + const timer = new Timer(true); + if (src === undefined || src === '') + return this.defaultImageBuffer; + + const cachedImage = this.cache.get(src); + if (cachedImage !== undefined) + return cachedImage.buffer; + + try { + const arrayBuffer = await (await fetch(src)).arrayBuffer(); + const buffer = Buffer.from(arrayBuffer); + this.logger.log.time('Fetched image', timer.stop().elapsedBlueStr); + return this.cache.set(src, { buffer }).buffer; + } catch (e: unknown) { + //throw Error('Invalid image'); + this.logger.log.error(e); + } + } +} diff --git a/api/routes/sharp/v2/services/ImageManager.ts b/api/routes/sharp/v2/services/ImageManager.ts new file mode 100644 index 0000000..a9be1c7 --- /dev/null +++ b/api/routes/sharp/v2/services/ImageManager.ts @@ -0,0 +1,16 @@ +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import Image from '../Image.js'; +import { ImageEditor } from './ImageEditor.js'; + +export default class ImageManager { + private readonly editor: ImageEditor; + + public constructor (public readonly logger: DefaultLogger) { + this.editor = new ImageEditor(logger); + } + + public async postImage(input: JObject): Promise { + const image = await this.editor.editImage(input); + return image; + } +} diff --git a/api/routes/sharp/v2/services/TextManager.ts b/api/routes/sharp/v2/services/TextManager.ts new file mode 100644 index 0000000..abe88a0 --- /dev/null +++ b/api/routes/sharp/v2/services/TextManager.ts @@ -0,0 +1,363 @@ +import can, { Canvas, CanvasRenderingContext2D, TextMetrics } from 'canvas'; +import chalk from 'chalk'; +import fs from 'fs'; +import { parse } from 'pb-text-format-to-json'; +import { fileURLToPath } from 'url'; + +import { DefaultOptions, InputOptions } from '../../../../types/PayloadTypes.js'; +import { isErrnoException } from '../../../../utils/index.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import Timer from '../../../../utils/Timer.js'; + +interface Font { + name: string; + path: string; + family: string; + registered?: true; +} +interface FontResponseData { + loaded: string[]; + missingMeta: string[]; + errors: number; +} +interface Max { + left: number; + right: number; + ascent: number; + descent: number; +} +interface LineProp extends Max { + line: string; +} + +export class TextManager { + private readonly fonts: Map; + private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../assets/fonts/'; + + public constructor(public readonly logger: DefaultLogger) { + this.fonts = new Map(); + const fontTimer = new Timer(); + this.loadFonts().then((responseData) => { + const result: unknown[] = ['Loaded', responseData.loaded.length, 'fonts.']; + if (responseData.missingMeta.length > 0) + result.push(responseData.missingMeta.length, chalk.yellow('fonts don\'t have METADATA.pb')); + this.logger.log.info('TextManager', ...result, fontTimer.elapsedBlueStr); + if (responseData.errors > 0) + this.logger.log.error('TextManager', `Encountered ${responseData.errors} errors while loading fonts`); + }).catch((err) => { + this.logger.log.error('LoadFonts', err); + }); + } + + public text2png(text: string, inputOptions: InputOptions = {}): Buffer { + // Options + const options = this.parseOptions(inputOptions); + // Register a custom font + + const font = this.getCanvasFont(options); + const canvas = new Canvas(100, 100, 'image'); + const ctx = canvas.getContext('2d'); + + const max = { + left: 0, + right: 0, + ascent: 0, + descent: 0 + }; + const lines = [...this.getLines(ctx, text, font, max, options.maxWidth)]; + + this.setCanvasWidth(canvas, options, lines, max); + + this.applyBorder(canvas, ctx, options); + this.applyBackgroundColour(canvas, ctx, options); + this.applyTextStyles(ctx, options, font); + + const lineHeight = max.ascent + max.descent + options.lineSpacing; + let offsetY = options.borderTopWidth + options.paddingTop; + for (const lineProp of lines) { + let x = 0; + const y = max.ascent + offsetY; + + // Calculate X + switch (options.textAlign) { + case 'left': + x = lineProp.left + options.borderLeftWidth + options.paddingLeft; + break; + + case 'right': + x = + canvas.width - + lineProp.left - + options.borderRightWidth - + options.paddingRight; + break; + + case 'center': + x = (max.left + max.right) / 2 + options.borderLeftWidth + options.paddingLeft; + break; + } + + if (options.strokeWidth > 0) { + ctx.strokeText(lineProp.line, x, y); + } + + ctx.fillText(lineProp.line, x, y); + + offsetY += lineHeight; + } + return canvas.toBuffer(); + } + + private parseOptions(options: InputOptions): DefaultOptions { + return { + font: options.font ?? 'sans-serif', + size: options.size ?? '30px', + textAlign: options.textAlign ?? 'left', + textColor: options.textColor ?? options.color ?? 'black', + backgroundColor: options.bgColor ?? options.backgroundColor, + lineSpacing: options.lineSpacing ?? 0, + maxWidth: options.maxWidth ?? undefined, + strokeWidth: options.strokeWidth ?? 0, + strokeColor: options.strokeColor ?? 'white', + + paddingLeft: options.paddingLeft ?? options.padding ?? 0, + paddingTop: options.paddingTop ?? options.padding ?? 0, + paddingRight: options.paddingRight ?? options.padding ?? 0, + paddingBottom: options.paddingBottom ?? options.padding ?? 0, + + borderLeftWidth: options.borderLeftWidth ?? options.borderWidth ?? 0, + borderTopWidth: options.borderTopWidth ?? options.borderWidth ?? 0, + borderBottomWidth: options.borderBottomWidth ?? options.borderWidth ?? 0, + borderRightWidth: options.borderRightWidth ?? options.borderWidth ?? 0, + borderColor: options.borderColor ?? 'black', + + localFontName: options.localFontName, + localFontPath: options.localFontPath, + + output: options.output ?? 'buffer' + }; + } + + private getCanvasFont(parsedOptions: DefaultOptions): string { + if (parsedOptions.font !== 'sans-serif') { + const font = this.fonts.get(parsedOptions.font); + if (font === undefined) + parsedOptions.font = 'sans-serif'; + else if (font.registered !== true) { + can.registerFont(font.path, { family: font.name }); + this.fonts.set(font.name, { ...font, registered: true }); + } + } + return `${parsedOptions.size} "${parsedOptions.font}"`; + } + + private *getLines(ctx: CanvasRenderingContext2D, text: string, font: string, max: Max, maxWidth?: number): IterableIterator { + const lines = text.split('\n'); + for (const line of lines) { + if (maxWidth !== undefined) { + ctx.font = font; + let str = ''; + for (const char of line) { + const metrics = ctx.measureText(str + char); + if (metrics.width <= maxWidth) { + str += char; + } else { + yield { + line: str, + ...this.getBoundingSize(metrics, max) + }; + str = char; + } + } + if (str !== '') { + const metrics = ctx.measureText(str); + yield { + line: str, + ...this.getBoundingSize(metrics, max) + }; + } + } else { + const metrics = ctx.measureText(line); + yield { + line, + ...this.getBoundingSize(metrics, max) + }; + } + } + } + + private getBoundingSize(metrics: TextMetrics, max: Max): Max { + const boundingSize = { + left: -1 * metrics.actualBoundingBoxLeft, + right: metrics.actualBoundingBoxRight, + ascent: metrics.actualBoundingBoxAscent, + descent: metrics.actualBoundingBoxDescent + }; + this.updateMaxBounding(boundingSize, max); + return boundingSize; + } + + private updateMaxBounding(currentBounding: Max, max: Max): void { + max.left = Math.max(max.left, currentBounding.left); + max.right = Math.max(max.right, currentBounding.right); + max.ascent = Math.max(max.ascent, currentBounding.ascent); + max.descent = Math.max(max.descent, currentBounding.descent); + } + + private setCanvasWidth(canvas: Canvas, options: DefaultOptions, lines: LineProp[], max: Max): void { + const lineHeight = max.ascent + max.descent + options.lineSpacing; + const contentWidth = max.left + max.right; + const contentHeight = + lineHeight * lines.length - + options.lineSpacing - + (max.descent - lines[lines.length - 1].descent); + + canvas.width = + contentWidth + + options.borderLeftWidth + + options.borderRightWidth + + options.paddingLeft + + options.paddingRight; + + canvas.height = + contentHeight + + options.borderTopWidth + + options.borderBottomWidth + + options.paddingTop + + options.paddingBottom; + } + + private applyBorder(canvas: Canvas, ctx: CanvasRenderingContext2D, options: DefaultOptions): void { + const hasBorder = + options.borderLeftWidth !== 0 || + options.borderTopWidth !== 0 || + options.borderRightWidth !== 0 || + options.borderBottomWidth !== 0; + + if (hasBorder) { + ctx.fillStyle = options.borderColor; + ctx.fillRect(0, 0, canvas.width, canvas.height); + if (options.backgroundColor === undefined) { + ctx.clearRect( + options.borderLeftWidth, + options.borderTopWidth, + canvas.width - (options.borderLeftWidth + options.borderRightWidth), + canvas.height - (options.borderTopWidth + options.borderBottomWidth) + ); + } + } + } + + private applyBackgroundColour(canvas: Canvas, ctx: CanvasRenderingContext2D, options: DefaultOptions): void { + if (options.backgroundColor !== undefined) { + ctx.fillStyle = options.backgroundColor; + ctx.fillRect( + options.borderLeftWidth, + options.borderTopWidth, + canvas.width - (options.borderLeftWidth + options.borderRightWidth), + canvas.height - (options.borderTopWidth + options.borderBottomWidth) + ); + } + } + + private applyTextStyles(ctx: CanvasRenderingContext2D, options: DefaultOptions, font: string): void { + ctx.font = font; + ctx.fillStyle = options.textColor; + ctx.antialias = 'gray'; + ctx.textAlign = options.textAlign; + ctx.lineWidth = options.strokeWidth; + ctx.strokeStyle = options.strokeColor; + } + + //* Font loading + private async loadFonts(): Promise { + const customRes = await this.loadFontsInDir('custom/'); + const oflRes = await this.loadFontsInDir('google/ofl/'); + const uflRes = await this.loadFontsInDir('google/ufl/'); + return { + loaded: customRes.loaded.concat(oflRes.loaded, uflRes.loaded), + missingMeta: customRes.missingMeta.concat(oflRes.missingMeta, uflRes.loaded), + errors: customRes.errors + oflRes.errors + uflRes.errors + }; + } + + private async loadFontsInDir(dir: string): Promise { + const responseData: FontResponseData = { + loaded: [], + missingMeta: [], + errors: 0 + }; + const fullDir = this.FONTS_ASSETS_DIR + dir; + try { + const fontDirs = await fs.promises.readdir(fullDir); + for (const fontDir of fontDirs) { + const stats = await fs.promises.stat(fullDir + fontDir); + if (!stats.isDirectory()) + continue; + try { + const metaFile = await fs.promises.readFile(fullDir + fontDir + '/' + 'METADATA.pb', 'utf-8'); + const parsedMeta = parse(metaFile); + if ('error' in parsedMeta) { //TODO More info with regards to error + responseData.errors += 1; + continue; + } + const fonts = this.validateMetadata(parsedMeta); + for (const font of fonts) { + this.fonts.set(font.name, { + name: font.name, + path: fullDir + fontDir + '/' + font.file, + family: font.family + }); + responseData.loaded.push(font.name); + } + } catch (err: unknown) { + if (isErrnoException(err)) { + if (err.code === 'ENOENT') + responseData.missingMeta.push(dir + fontDir); + } + } + } + return responseData; + } catch (err: unknown) { + this.logger.log.error('LoadFonts', err); + responseData.errors += 1; + return responseData; + } + } + + private validateMetadata(input: JObject): { name: string; file: string; family: string; }[] { + const fonts = []; + if ('name' in input && typeof input.name === 'string' && 'fonts' in input) { + if (!Array.isArray(input.fonts)) + input.fonts = [input.fonts]; + + if (Array.isArray(input.fonts)) { + for (const font of input.fonts) { + if (typeof font !== 'object' || font === null) + continue; + + if ('filename' in font && 'full_name' in font) + if (typeof font.filename === 'string' && typeof font.full_name === 'string') + fonts.push({ + name: font.full_name, + file: font.filename, + family: input.name + }); + } + } + } + return fonts; + } + + public get availableFontFamilies(): Record { + const familyMappedObj = [...this.fonts.values()].reduce((a: Record, font) => { + if (font.family in a) { + a[font.family].push(font.name); + } else { + a[font.family] = [font.name]; + } + return a; + }, {}); + return familyMappedObj; + } +} diff --git a/api/routes/sharp/v2/validateInput.ts b/api/routes/sharp/v2/validateInput.ts new file mode 100644 index 0000000..f6a55ae --- /dev/null +++ b/api/routes/sharp/v2/validateInput.ts @@ -0,0 +1,84 @@ +import { guard } from '../../../utils/guard/index.js'; +import { mapping } from '../../../utils/mapping/index.js'; + +export interface ValidInputObject { + background: string; + cacheDuration?: number; + operations: JObject[]; +} + +// Aliases on base object or +const propertyAliases = { + bg: 'background', + h: 'height', + w: 'width', + t: 'type', + d: 'data', + // txt: 'text', + // o: 'opacity', + // r: 'rotate', + // s: 'shape', + align: 'alignment', + // children: 'images', + ops: 'operations' +}; + +/* const imageMapping = mapping.object({ + background: mapping.string.optional, + x: mapping.number.optional, + y: mapping.number.optional, + alignment: mapping.string.optional, + size: mapping.string.optional, + blendMode: mapping.string.optional +}); */ + +const inputObjectMapping = mapping.object({ + background: mapping.string.optional, + cacheDuration: mapping.number.optional, + responseType: mapping.string.optional, + operations: mapping.array(mapping.unknown).optional +}); + +export function validateRootInput(input: JObject): ValidInputObject | undefined { + convertAliases(input); + const mappedInputObject = inputObjectMapping(input); + if (!mappedInputObject.valid) + return; + + const rootImageInput = mappedInputObject.value; + + const operations = []; + + if (guard.hasProperty(rootImageInput, 'operations') && Array.isArray(rootImageInput.operations)) { + for (const element of rootImageInput.operations) { + const mappedOperation = mapping.jObject(element); + if (!mappedOperation.valid) + operations.push(generateInvalidOperation(element)); + else + operations.push(convertAliases(mappedOperation.value)); + } + } + return { background: rootImageInput.background ?? '', operations }; +} + +function convertAliases(input: JObject): JObject { + for (const key of Object.keys(input)) + if (guard.hasProperty(propertyAliases, key)) { + input[propertyAliases[key]] = input[key]; + delete input[key]; + } + return input; +} + +function generateInvalidOperation(operation: unknown): JObject { + const mappedJtoken = mapping.jToken(operation); + if (mappedJtoken.valid) + return { + type: 'invalid_operation', + data: mappedJtoken.value + }; + return { + type: 'invalid_operation', + data: 'undefined' + }; +} diff --git a/api/tsconfig.json b/api/tsconfig.json index ebddd8f..6aea77e 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -2,10 +2,10 @@ "compilerOptions": { "noImplicitAny": true, "strict": true, - "module": "NodeNext", + "module": "ES2022", "resolveJsonModule": true, "esModuleInterop": true, - "target": "ES2021", + "target": "ES2022", "strictNullChecks": true, "sourceMap": true, "noImplicitReturns": true, @@ -18,7 +18,7 @@ "noUnusedParameters": true, "allowUnreachableCode": false, "allowUnusedLabels": false, - "moduleResolution": "NodeNext", + "moduleResolution": "Node", "types": [], "lib": ["ES2021"], "baseUrl": "./", diff --git a/api/types/ImageTypes.ts b/api/types/ImageTypes.ts index 14f8503..2d7ec9a 100644 --- a/api/types/ImageTypes.ts +++ b/api/types/ImageTypes.ts @@ -1,6 +1,6 @@ import sharp from 'sharp'; -import Image from '../routes/sharp/managers/Image.js'; +import Image from '../routes/sharp/v1/managers/Image.js'; import { InputBody } from './PayloadTypes.js'; export interface MetaBody { @@ -9,7 +9,7 @@ export interface MetaBody { warnings: string[]; } -export type OutputBody = { +export interface OutputBody { image: Image; meta: MetaBody; body: InputBody; diff --git a/api/types/PayloadTypes.ts b/api/types/PayloadTypes.ts index 90253ce..93c755e 100644 --- a/api/types/PayloadTypes.ts +++ b/api/types/PayloadTypes.ts @@ -52,6 +52,7 @@ export interface InputBody { } // Text types export interface InputOptions { + text?: string; font?: string; size?: string; textAlign? : 'left' | 'center' | 'right'; @@ -79,24 +80,24 @@ export interface InputOptions { output?: 'buffer' | 'stream' | 'dataURL' | 'canvas'; } export interface DefaultOptions { - font: string | 'sans-serif'; - size: string | '30px'; + font: string// | 'sans-serif'; + size: string// | '30px'; textAlign : 'left' | 'center' | 'right'; textColor: string; backgroundColor?: string; - lineSpacing: number | 0; + lineSpacing: number// | 0; maxWidth?: number; - strokeWidth: number | 0; - strokeColor: string | 'white'; - paddingLeft: number | 0; - paddingRight: number | 0; - paddingTop: number | 0; - paddingBottom: number | 0; - borderLeftWidth: number | 0; - borderRightWidth: number | 0; - borderBottomWidth: number | 0; - borderTopWidth: number | 0; - borderColor: string | 'black'; + strokeWidth: number// | 0; + strokeColor: string// | 'white'; + paddingLeft: number// | 0; + paddingRight: number// | 0; + paddingTop: number// | 0; + paddingBottom: number// | 0; + borderLeftWidth: number// | 0; + borderRightWidth: number// | 0; + borderBottomWidth: number// | 0; + borderTopWidth: number// | 0; + borderColor: string// | 'black'; localFontPath?: string; localFontName?: string; output: 'buffer' | 'stream' | 'dataURL' | 'canvas'; diff --git a/api/types/index.ts b/api/types/index.ts index 4c3dd40..5214ee0 100644 --- a/api/types/index.ts +++ b/api/types/index.ts @@ -1,3 +1,3 @@ export * from './Config.js'; -export * from './PayloadTypes.js'; export * from './ImageTypes.js'; +export * from './PayloadTypes.js'; diff --git a/api/routes/sharp/managers/CacheManager.ts b/api/utils/CacheManager.ts similarity index 85% rename from api/routes/sharp/managers/CacheManager.ts rename to api/utils/CacheManager.ts index 0b14ae1..54761f4 100644 --- a/api/routes/sharp/managers/CacheManager.ts +++ b/api/utils/CacheManager.ts @@ -5,10 +5,10 @@ interface TimeInfo { duration: number; } -type CacheManagerArgument = { +interface CacheManagerArgument { hours?: number; refresh?: number; -}; +} interface CacheDurations { hours: number; @@ -19,15 +19,16 @@ export default class CacheManager { private readonly durations: CacheDurations; private readonly cache: Map; private singleSweepHandler: ((id: string, obj: (DataObj & TimeInfo)) => void) | undefined; - private multipleSweepHandler: ((items: Array<[string, (DataObj & TimeInfo)]>) => void) | undefined; + private multipleSweepHandler: ((items: [string, (DataObj & TimeInfo)][]) => void) | undefined; public constructor(inputObj: CacheManagerArgument = {}) { - this.durations = Object.assign({hours: 24, refresh: 6}, inputObj); + this.durations = Object.assign({ hours: 24, refresh: 6 }, inputObj); this.cache = new Map(); setInterval(() => this.sweepData(), this.durations.refresh * MS_IN_HOUR); } public get(id: string): (DataObj & TimeInfo) | undefined { + this.refreshTimestamp(id); return this.cache.get(id); } @@ -56,7 +57,7 @@ export default class CacheManager { } private sweepData(): void { - const deletedItems: Array<[string, (DataObj & TimeInfo)]> = []; + const deletedItems: [string, (DataObj & TimeInfo)][] = []; for (const [id, value] of this.cache) { if ((Date.now() - value.timestamp) / MS_IN_HOUR > value.duration) { const deletedObj = this.delete(id); @@ -76,7 +77,8 @@ export default class CacheManager { public registerSingleSweepHandler(handler: (id: string, obj: (DataObj & TimeInfo)) => void): void { this.singleSweepHandler = handler; } - public registerMultipleSweepHandler(handler: (items: Array<[string, (DataObj & TimeInfo)]>) => void): void { + + public registerMultipleSweepHandler(handler: (items: [string, (DataObj & TimeInfo)][]) => void): void { this.multipleSweepHandler = handler; } } diff --git a/api/utils/HttpException.ts b/api/utils/HttpException.ts new file mode 100644 index 0000000..cf84c00 --- /dev/null +++ b/api/utils/HttpException.ts @@ -0,0 +1,9 @@ +export default class HttpException extends Error { + public status: number; + public message: string; + public constructor(status: number, message: string) { + super(message); + this.status = status; + this.message = message; + } +} diff --git a/api/routes/sharp/managers/Timer.ts b/api/utils/Timer.ts similarity index 99% rename from api/routes/sharp/managers/Timer.ts rename to api/utils/Timer.ts index 8435d11..28e414d 100644 --- a/api/routes/sharp/managers/Timer.ts +++ b/api/utils/Timer.ts @@ -1,6 +1,7 @@ -import chalk from 'chalk'; import { hrtime } from 'node:process'; +import chalk from 'chalk'; + export default class Timer { private startTime?: bigint; private stopTime?: bigint; @@ -13,24 +14,30 @@ export default class Timer { this.startTime = hrtime.bigint(); return this; } + public stop(): this { this.stopTime = hrtime.bigint(); return this; } + public reset(): this { this.stopTime = undefined; this.start(); return this; } + public get elapsedNanoSeconds(): bigint { return (this.stopTime ?? hrtime.bigint()) - (this.startTime ?? BigInt(0)); } + public get elapsedMicroSeconds(): bigint { return this.elapsedNanoSeconds / BigInt(1000); } + public get elapsedMS(): bigint { return this.elapsedNanoSeconds / BigInt(1000_000); } + public get elapsedBlueStr(): string { return chalk.hex('#00F9FF')(`(${Math.round(Number(this.elapsedMS) * 1000) / 1000}ms)`); } diff --git a/api/utils/env/createEnv.ts b/api/utils/env/createEnv.ts index c816781..b8d6c95 100644 --- a/api/utils/env/createEnv.ts +++ b/api/utils/env/createEnv.ts @@ -1,8 +1,8 @@ -import dotenv from 'dotenv'; +import { config } from 'dotenv'; import validateEnv from './validateEnv.js'; -dotenv.config(); +config(); validateEnv(); export default process.env; diff --git a/api/utils/env/validateEnv.ts b/api/utils/env/validateEnv.ts index b8c7818..f7767be 100644 --- a/api/utils/env/validateEnv.ts +++ b/api/utils/env/validateEnv.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/naming-convention */ import { cleanEnv, port, str } from 'envalid'; const validateEnv = (): void => { diff --git a/api/utils/logging/CatLoggr.ts b/api/utils/logging/CatLoggr.ts deleted file mode 100644 index f26a9f7..0000000 --- a/api/utils/logging/CatLoggr.ts +++ /dev/null @@ -1,514 +0,0 @@ -import { ChalkInstance, default as chalk } from 'chalk'; -import dayjs from 'dayjs'; -import emojiRegex from 'emoji-regex'; -import { WriteStream } from 'tty'; -import * as util from 'util'; - -export class LoggrConfig { - public shardId?: number | string; - public shardLength?: number; - - public timestampFormat?: string; - - public level?: string; - public levels?: LogLevel[]; - - public meta?: LogMeta; - - public stdout?: WriteStream; - public stderr?: WriteStream; - - public constructor({ shardId, shardLength, level, levels, meta, stdout, stderr, timestampFormat }: LoggrConfig) { - this.shardId = shardId; - this.shardLength = shardLength; - this.level = level; - this.levels = levels; - this.meta = meta; - this.stdout = stdout; - this.stderr = stderr; - this.timestampFormat = timestampFormat; - } -} - -export class LogLevel { - public name: string; - public color: ChalkInstance; - public err = false; - public trace = false; - public aliases: string[] = []; - public position?: number; - - public constructor(name: string, color: ChalkInstance) { - this.name = name; - this.color = color; - } - - public setError(err = true): LogLevel { - this.err = err; - return this; - } - - public setTrace(trace = true): LogLevel { - this.trace = trace; - return this; - } - - public setAliases(...aliases: string[]): LogLevel { - this.aliases = aliases; - return this; - } -} - -/** - * @typedef {Object} LogMeta - * @property {number} [metaObject.depth=1] The depth of objects to inspect - * @property {boolean} [metaObject.color=true] Whether to display colors - * @property {boolean} [metaObject.trace=false] Whether to generate a stacktrace - */ -export class LogMeta { - public depth?: number = 1; - public color?: boolean = true; - public trace?: boolean = false; - public shardId?: string | number = ''; - public quote?: boolean = false; - public context?: object = {}; - - public constructor({ depth = 1, color = true, trace = false, shardId = '', quote = false, context = {} }: LogMeta) { - this.depth = depth; - this.color = color; - this.trace = trace; - this.shardId = shardId; - this.quote = quote; - this.context = context; - } -} - -/** - * An argument hook callback function - * - * @callback ArgHookCallback - * @param {Object} params The params that are sent by the hook - * @param {*} [params.arg] The provided argument - * @param {Date} params.date The timestamp of execution - * @returns {string|null} The processed argument result, or `null` to continue executing - */ -export type ArgHookCallback = (params: { arg?: unknown; date: Date; level: string; }) => string | null; - -/** - * A post hook callback function - * - * @callback PostHookCallback - * @param {Object} params The params that are sent by the hook - * @param {string} params.level The level of the log - * @param {boolean} params.error A flag signifying that the log is an error - * @param {string} params.text The final formatted text - * @param {Date} params.date The timestamp of execution - * @param {string} params.timestamp The formatted timestamp - * @param {string} [params.shard] The shard ID - * @param {object} [params.context] Context passed through meta info - * @param {LogMeta} [params.meta] Raw meta info - * @returns {string|null} The processed result, or `null` to continue executing - */ -export type PostHookCallback = (params: { - level: string; - error: boolean; - text: string; - date: Date; - timestamp: string; - shard?: string; - context?: object; - meta: LogMeta; -}) => string | null; - -/** - * A post hook callback function - * - * @callback PreHookCallback - * @param {Object} params The params that are sent by the hook - * @param {string} params.level The level of the log - * @param {boolean} params.error A flag signifying that the log is an error - * @param {any[]} params.args The args being logged - * @param {Date} params.date The timestamp of execution - * @param {string} params.timestamp The formatted timestamp - * @param {string} [params.shard] The shard ID - * @param {object} [params.context] Context passed through meta info - * @param {LogMeta} [params.meta] Raw meta info - * @returns {string|null} The processed result, or `null` to continue executing - */ -export type PreHookCallback = (params: { - level: string; - error: boolean; - args: unknown[]; - date: Date; - timestamp: string; - shard?: string; - context?: object; - meta: LogMeta; -}) => string | null; - -export class LogHooks { - public pre: PreHookCallback[] = []; - public arg: ArgHookCallback[] = []; - public post: PostHookCallback[] = []; -} - -/** - * Class containing logging functionality - */ -export default class CatLoggr { - public static get defaultLevels(): LogLevel[] { - chalk.red.bgBlack; - return [ - new LogLevel('fatal', chalk.red.bgBlack).setError(), - new LogLevel('error', chalk.black.bgRed).setError(), - new LogLevel('warn', chalk.black.bgYellow).setError(), - new LogLevel('trace', chalk.green.bgBlack).setTrace(), - new LogLevel('init', chalk.black.bgBlue), - new LogLevel('info', chalk.black.bgGreen), - new LogLevel('verbose', chalk.black.bgCyan), - new LogLevel('debug', chalk.magenta.bgBlack).setAliases('log', 'dir') - ]; - } - - private readonly _config: LoggrConfig; - private readonly _shard?: number | string; - private readonly _shardLength?: number; - private _levelName: string; - private _levels: LogLevel[]; - private _levelMap: { [name: string]: LogLevel; }; - private _meta: LogMeta; - private _defaultMeta?: LogMeta; - private readonly _stdout: WriteStream | NodeJS.WriteStream; - private readonly _stderr: WriteStream | NodeJS.WriteStream; - private _maxLength: number; - private readonly _hooks: LogHooks; - - [key: string]: unknown; - - /** - * Creates an instance of the logger. - * @param {LoggrConfig} [options] Configuration options - * @param {string|number} [options.shardId] The shard ID that the logger is on - * @param {string|number} [options.shardLength=4] The maximum number of characters that a shard can be - * @param {string} [options.level=info] The default log threshold - * @param {level[]} [options.levels] Custom level definitions - * @param {metaObject} [options.meta] The default meta configuration - * @param {WriteStream} [options.stdout] The output stream to use for general logs - * @param {WriteStream} [options.stderr] The output stream to use for error logs - */ - public constructor(config?: LoggrConfig) { - this._levels = []; - this._levelMap = {}; - this._levelName = 'log'; - if (config === undefined) config = new LoggrConfig({}); - this._config = config; - if (config.shardId !== undefined) { - this._shard = config.shardId; - this._shardLength = config.shardLength; - // if (typeof this._shard === 'number' && this._shard < 10) this._shard = '0' + this._shard; - } - - this._stdout = config.stdout !== undefined ? config.stdout : process.stdout; - this._stderr = config.stderr !== undefined ? config.stderr : process.stderr; - this._maxLength = 0; - - this.setLevels(config.levels !== undefined ? config.levels : CatLoggr.defaultLevels); - this.setLevel(config.level ?? this._levels[this._levels.length - 1].name); - - this.setDefaultMeta(config.meta !== undefined ? config.meta : {}); - this._meta = {}; - - this._hooks = new LogHooks(); - } - - /** - * A helper reference to the chalk library - */ - public static get _chalk(): ChalkInstance { - return chalk; - } - - /** - * Adds a pre-hook - * @param {ArgHookCallback} func The hook callback - * @returns {CatLoggr} Self for chaining - */ - public addPreHook(func: ArgHookCallback): this { - this._hooks.pre.push(func); - - return this; - } - - /** - * Adds an arg-hook - * @param {ArgHookCallback} func The hook callback - * @returns {CatLoggr} Self for chaining - */ - public addArgHook(func: ArgHookCallback): this { - this._hooks.arg.push(func); - - return this; - } - - /** - * Adds a post-hook - * @param {PostHookCallback} func - * @returns {CatLoggr} Self for chaining - */ - public addPostHook(func: PostHookCallback): this { - this._hooks.post.push(func); - - return this; - } - - /** - * Sets the default meta object to use for all logs. - * @param {metaObject?} meta The default meta object to use - * @returns {CatLoggr?} Self for chaining - */ - public setDefaultMeta(meta: LogMeta): this { - if (typeof meta !== 'object') - throw new TypeError('meta must be an object'); - - this._defaultMeta = new LogMeta(meta); - - return this; - } - - /** - * Sets the level threshold. Only logs on and above the threshold will be output. - * @param {string} level The level threshold - * @returns {CatLoggr} Self for chaining - */ - public setLevel(level: string): this { - if (typeof level !== 'string') - throw new TypeError('level must be a string'); - - if (!(level in this._levelMap)) - throw new Error(`the level '${level}' does not exist`); - - this._levelName = level; - return this; - } - - private _isEmoji(str: string): boolean { - const match = str.match(emojiRegex()); - return match !== null ? match[0] === str : false; - } - - /** - * @typedef level - * @property {string} level.name The name of the level - * @property {Object} level.color The color of the level (using chalk) - * @property {string[]} level.aliases The alternate names that can be used to invoke the level - * @property {boolean} level.err A flag signifying that the level writes to stderr - * @property {boolean} level.trace A flag signifying that the level should generate a stacktrace - */ - - /** - * Overwrites the currently set levels with a custom set. - * @param {level[]} levels An array of levels, in order from high priority to low priority - * @returns {CatLoggr} Self for chaining - */ - public setLevels(levels: LogLevel[]): this { - if (!Array.isArray(levels)) - throw new TypeError('levels must be an array.'); - - this._levelMap = {}; - this._levels = levels; - let max = 0; - this._levels = this._levels.map(l => { - l.position = levels.indexOf(l); - this._levelMap[l.name] = l; - const func = function (this: CatLoggr, ...args: unknown[]) { - return this._format(l, ...args); - }.bind(this); - this[l.name] = func; - if (Array.isArray(l.aliases)) - for (const alias of l.aliases) this[alias] = func; - const nameLength = this._isEmoji(l.name) ? 1 : l.name.length; - max = nameLength > max ? nameLength : max; - - return l; - }); - - if (this._levelName in this._levelMap) - this._levelName = this._levels[this._levels.length - 1].name; - - this._maxLength = max + 2; - - return this; - } - - /** - * Registers CatLoggr as the global `console` property. - * @returns {CatLoggr} Self for chaining - */ - public setGlobal(): this { - Object.defineProperty.bind(this)(global, 'console', { - get: () => { - return this; - } - }); - return this; - } - - public get _level(): LogLevel { - return this._levelMap[this._levelName]; - } - - public get _timestamp(): { raw: Date; formatted: string; formattedRaw: string; } { - const ts = dayjs(); - const formatted = ts.format(this._config.timestampFormat ?? 'MM/DD HH:mm:ss'); - return { - raw: ts.toDate(), - formatted: chalk.black.bgWhite(` ${formatted} `), - formattedRaw: formatted - }; - } - - /** - * Center aligns text. - * @param {string} text The text to align - * @param {number} length The length that it should be padded to - * @returns {string} The padded text - */ - public _centrePad(text: string, length: number): string { - const textLength = this._isEmoji(text) ? 1 : text.length; - if (textLength < length) - return ' '.repeat(Math.floor((length - textLength) / 2)) - + text + ' '.repeat(Math.ceil((length - textLength) / 2)); - return text; - } - - /** - * Writes the log to the proper stream. - * @param {Level} level The level of the log - * @param {string} text The text to write - * @param {boolean} err A flag signifying whether to write to stderr - * @param {Object} [timestamp] An optional timestamp to use - * @param {string} timestamp.formatted The formatted timestamp - * @param {Date} timestamp.raw The raw timestamp - * @returns {CatLoggr} Self for chaining - */ - public _write(level: LogLevel, text: string, err = false, - timestamp?: { formatted: string; raw: Date; formattedRaw: string; }): this { - if (timestamp === undefined) timestamp = this._timestamp; - const levelStr = level.color(this._centrePad(level.name, this._maxLength)); - const stream = err ? this._stderr : this._stdout; - let shardText = ''; - if (this._shard !== undefined) - shardText = chalk.black.bold.bgYellow( - this._centrePad(this._meta.shardId !== undefined ? this._meta.shardId.toString() : this._shard.toString(), - this._shardLength ?? 0) - ); - - for (const hook of this._hooks.post) { - if (typeof hook === 'function') { - const res = hook({ - text, - date: timestamp.raw, - timestamp: timestamp.formattedRaw, - shard: this._shard !== undefined ? this._shard.toString() : undefined, - level: level.name, - error: level.err, - context: this._meta.context, - meta: this._meta - }); - if (res === null) continue; - else { - text = res.toString(); - } - break; - } - } - - stream.write(`${shardText}${timestamp.formatted}${levelStr} ${text}\n`); - - this._meta = {}; - return this; - } - - /** - * Sets the meta for the next log. - * @param {metaObject} meta - The meta object to set - * @returns {CatLoggr} Self for chaining - */ - public meta(meta = {}): this { - const temp = {}; - Object.assign(temp, this._defaultMeta, meta); - this._meta = temp; - return this; - } - - /** - * Formats logs in preparation for writing. - * @param {string} level The level of the log - * @param {*} args The args that were directly passed to the function - * @returns {CatLoggr} Self for chaining - */ - public _format(level: LogLevel, ...args: unknown[]): this { - const timestamp = this._timestamp; - if ((level.position ?? 0) > (this._level.position ?? 0)) return this; - let output = ''; - const text = []; - if (typeof args[0] === 'string') { - const formats = args[0].match(/%[sdifjoO]/g); - if (formats !== null) { - const a = args.splice(1, formats.length); - args.unshift(util.format(args.shift(), ...a)); - } - } - - for (const hook of this._hooks.pre) { - hook({ - args, - date: timestamp.raw, - timestamp: timestamp.formattedRaw, - shard: this._shard !== undefined ? this._shard.toString() : undefined, - level: level.name, - error: level.err, - context: this._meta.context, - meta: this._meta - }); - } - - for (const arg of args) { - let finished = false; - for (const hook of this._hooks.arg) { - if (typeof hook === 'function') { - const res = hook({ arg, date: timestamp.raw, level: level.name }); - if (res === null) continue; - else if (Array.isArray(res)) { - text.push(...res); - } else { - text.push(res); - } - finished = true; - break; - } - } - if (finished) continue; - - if (typeof arg === 'string' && !level.err) { - text.push(chalk.magenta(this._meta.quote === undefined ? `'${arg}'` : arg)); - } else if (typeof arg === 'number') { - text.push(chalk.cyan(arg.toString())); - } else if (typeof arg === 'object') { - if (arg instanceof Error) { - text.push(chalk.bold.red(arg.stack)); - } else { - text.push('\n'); - text.push(util.inspect(arg, this._meta)); - } - } else text.push(arg); - } - - output += text.join(' '); - if (level.trace || (this._meta.trace ?? false)) { - output += '\n' + (new Error().stack ?? '').split('\n').slice(1).join('\n'); - } - if (level.err) output = chalk.bold.red(output); - return this._write(level, output, level.err).meta(); - } -} diff --git a/api/utils/logging/NiceLogger.ts b/api/utils/logging/NiceLogger.ts new file mode 100644 index 0000000..85c0ffe --- /dev/null +++ b/api/utils/logging/NiceLogger.ts @@ -0,0 +1,59 @@ +import chalk, { ChalkInstance } from 'chalk'; + +import { createLogger } from './WinstonLogger.js'; + +type LoggerFunction = (...args: unknown[]) => void; + +export const defaultLogLevels = { + error: chalk.black.bgRed, + warning: chalk.white.bgYellow, + info: chalk.bgGreenBright, + image: chalk.bgCyan, + operation: chalk.bgGray, + prisma: chalk.white.bgCyanBright, + time: chalk.white.bgBlueBright, + endpoint: chalk.white.bgMagenta, + verbose: chalk.gray +}; + +export type DefaultLogLevels = typeof defaultLogLevels; + +// I hate this so much I hate this so much I hate this so much I hate this so much +export class NiceLogger> { + #logger: ReturnType; + public readonly log: Record; + private logHistory: { level: keyof L; log: unknown[]; timestamp: number }[] = []; + + public constructor({ defaultLevel, levels }: { defaultLevel?: keyof typeof levels; levels: L }) { + this.#logger = createLogger({ + level: String(defaultLevel) ?? 'verbose', + levels + }); + const logger: Record = {}; + for (const level of Object.keys(levels)) { + logger[level] = (...args: unknown[]) => { + this.logHistory.push({ level, log: args, timestamp: Date.now() }); + (this.#logger[level] as LoggerFunction)(...args); + }; + } + this.log = logger as Record; + } +} + +export type DefaultLogger = NiceLogger; + +// const logLevels = [ +// { name: '❌', color: CatLoggr._chalk.black.bgBlack, aliases: ['error'], isError: true }, +// { name: '❓', color: CatLoggr._chalk.black.bgYellow, aliases: ['warning'], isError: true }, +// { name: '✅', color: CatLoggr._chalk.bgGreenBright, aliases: ['info'] }, +// { name: '📸', color: CatLoggr._chalk.bgCyan, aliases: ['image'] }, +// { name: '🔧', color: CatLoggr._chalk.bgGray, aliases: ['operation', 'op'] }, +// { name: '💾', color: CatLoggr._chalk.white.bgCyanBright, aliases: ['prisma', 'db'] }, +// { name: '⌛', color: CatLoggr._chalk.white.bgBlueBright, aliases: ['time', 'stopwatch', 'sw'] }, +// { name: '📬', color: CatLoggr._chalk.white.bgMagenta, aliases: ['endpoint'] } +// ] as const; + +// type LogLevels = typeof logLevels[number]; +// type LogTypes = +// | LogLevels['name'] +// ; diff --git a/api/utils/logging/WinstonLogger.ts b/api/utils/logging/WinstonLogger.ts new file mode 100644 index 0000000..435bbb6 --- /dev/null +++ b/api/utils/logging/WinstonLogger.ts @@ -0,0 +1,68 @@ +import chalk, { ChalkInstance } from 'chalk'; +import * as winston from 'winston'; +import { AbstractConfigSetLevels } from 'winston/lib/winston/config'; + +export type LevelsType = Record; + +interface LevelsConfig { + levels: Record; + colors: Record; +} + +//winston.addColors(config.colors); + +type CreateWinstonLoggerReturn = winston.Logger & Record; + +function createWinstonLogger(options?: Pick> & { levels: T }): CreateWinstonLoggerReturn { + return winston.createLogger(options) as CreateWinstonLoggerReturn; +} + +interface LoggerOptions { + levels: LevelsType; + level: string +} + +export function createLogger(options: LoggerOptions): CreateWinstonLoggerReturn { + const config = Object.keys(options.levels).reduce((a, c, i) => { + const level = c; + a.levels[level] = i; + a.colors[level] = options.levels[level]; + return a; + }, { levels: {}, colors: {} } as LevelsConfig); + const padForLevel: Record = {}; + const maxLength = Object.keys(options.levels).sort((a, b) => b.length - a.length)[0].length + 2; + + for (const level of Object.keys(config.levels)) { + padForLevel[level] = levelPadding(level); + } + + function levelPadding(str: string): string { + return str.padStart(str.length + Math.ceil((maxLength - str.length) / 2), ' ') + .padEnd(maxLength, ' '); + } + + function padTimestamp(str: string, padLength = 2): string { + const padding = ' '.repeat(padLength); + return padding + str + padding; + } + function timestampLevelFormat(info: winston.Logform.TransformableInfo): string { + return `${chalk.bgWhite.black(padTimestamp((info.timestamp as string)))}${config.colors[info.level](levelPadding(info.level))}`; + } + return createWinstonLogger({ + level: options.level, + levels: config.levels, + format: winston.format.combine( + winston.format.errors({ stack: true }), + //winston.format.colorize(), + winston.format.timestamp({ format: 'YY-MM-DD HH:mm:ss' }), + winston.format.printf((info) => { + if (info.level === 'error') { + if ('stack' in info) + return `${(info.timestamp)}${info.stack}}`; + } + return `${timestampLevelFormat(info)} ${info.message}`; + }) + ), + transports: [new winston.transports.Console()] + }); +} diff --git a/api/utils/mapping/mapArray.ts b/api/utils/mapping/mapArray.ts index adecb2b..c6afa9e 100644 --- a/api/utils/mapping/mapArray.ts +++ b/api/utils/mapping/mapArray.ts @@ -3,7 +3,7 @@ import { result } from './result.js'; import { TypeMapping, TypeMappingImpl } from './types.js'; export function mapArray(mapping: TypeMappingImpl): TypeMapping { - return createMapping(value => { + return createMapping((value) => { if (!Array.isArray(value)) return result.failed; diff --git a/api/utils/mapping/mapBase64.ts b/api/utils/mapping/mapBase64.ts index b20050f..3589a1b 100644 --- a/api/utils/mapping/mapBase64.ts +++ b/api/utils/mapping/mapBase64.ts @@ -3,7 +3,7 @@ import { result } from './result.js'; import { TypeMapping, TypeMappingImpl } from './types.js'; export function mapBase64(mapping: TypeMappingImpl): TypeMapping { - return createMapping(value => { + return createMapping((value) => { if (typeof value !== 'string') return result.failed; try { diff --git a/api/utils/mapping/mapBigInt.ts b/api/utils/mapping/mapBigInt.ts index 21f0921..edd7bf1 100644 --- a/api/utils/mapping/mapBigInt.ts +++ b/api/utils/mapping/mapBigInt.ts @@ -1,7 +1,7 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; -export const mapBigInt = createMapping(value => { +export const mapBigInt = createMapping((value) => { try { switch (typeof value) { case 'bigint': return result.success(value); diff --git a/api/utils/mapping/mapBoolean.ts b/api/utils/mapping/mapBoolean.ts index ef39adc..6facc6d 100644 --- a/api/utils/mapping/mapBoolean.ts +++ b/api/utils/mapping/mapBoolean.ts @@ -1,8 +1,8 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; -export const mapBoolean = createMapping(value => { - return typeof value === 'boolean' - ? result.success(value) - : result.failed; +export const mapBoolean = createMapping((value) => { + return typeof value === 'boolean' ? + result.success(value) : + result.failed; }); diff --git a/api/utils/mapping/mapChoice.ts b/api/utils/mapping/mapChoice.ts index a226f58..0289265 100644 --- a/api/utils/mapping/mapChoice.ts +++ b/api/utils/mapping/mapChoice.ts @@ -3,7 +3,7 @@ import { result } from './result.js'; import { TypeMapping, TypeMappingImpl } from './types.js'; export function mapChoice(...mappings: { [P in keyof T]: TypeMappingImpl }): TypeMapping { - return createMapping(value => { + return createMapping((value) => { for (const mapping of mappings) { const mapped = mapping(value); if (mapped.valid) diff --git a/api/utils/mapping/mapDate.ts b/api/utils/mapping/mapDate.ts index 7784795..fead5d7 100644 --- a/api/utils/mapping/mapDate.ts +++ b/api/utils/mapping/mapDate.ts @@ -4,7 +4,7 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; import { TypeMapping } from './types.js'; -export const mapDate: TypeMapping = createMapping(value => { +export const mapDate: TypeMapping = createMapping((value) => { switch (typeof value) { case 'string': { const mapped = moment(value); diff --git a/api/utils/mapping/mapDuration.ts b/api/utils/mapping/mapDuration.ts index d4a4058..12fd945 100644 --- a/api/utils/mapping/mapDuration.ts +++ b/api/utils/mapping/mapDuration.ts @@ -6,7 +6,7 @@ import { TypeMapping } from './types.js'; const { duration } = momentTimezone; -export const mapDuration: TypeMapping = createMapping(value => { +export const mapDuration: TypeMapping = createMapping((value) => { try { switch (typeof value) { case 'string': diff --git a/api/utils/mapping/mapFake.ts b/api/utils/mapping/mapFake.ts index cbe9d0e..a6cd9aa 100644 --- a/api/utils/mapping/mapFake.ts +++ b/api/utils/mapping/mapFake.ts @@ -2,5 +2,5 @@ import { result } from './result.js'; import { TypeMappingResult } from './types.js'; export function mapFake(value: unknown): TypeMappingResult { - return result.success(value); + return result.success((value as T)); } diff --git a/api/utils/mapping/mapGuard.ts b/api/utils/mapping/mapGuard.ts index bb1f378..91d54ee 100644 --- a/api/utils/mapping/mapGuard.ts +++ b/api/utils/mapping/mapGuard.ts @@ -3,7 +3,7 @@ import { result } from './result.js'; import { TypeMapping } from './types.js'; export function mapGuard(guard: (value: unknown) => value is T): TypeMapping { - return createMapping(value => { + return createMapping((value) => { if (guard(value)) return result.success(value); return result.failed; diff --git a/api/utils/mapping/mapIn.ts b/api/utils/mapping/mapIn.ts index 35e30a0..16e5b05 100644 --- a/api/utils/mapping/mapIn.ts +++ b/api/utils/mapping/mapIn.ts @@ -7,9 +7,9 @@ export function mapIn(...values: T[]): TypeMapping; export function mapIn(...values: T): TypeMapping { const valueSet = new Set(values); - return createMapping(value => { + return createMapping((value) => { if (valueSet.has(value)) - return result.success(value); + return result.success((value as T[number])); return result.failed; }); } diff --git a/api/utils/mapping/mapInstanceof.ts b/api/utils/mapping/mapInstanceof.ts index 1a0ec84..25ede0d 100644 --- a/api/utils/mapping/mapInstanceof.ts +++ b/api/utils/mapping/mapInstanceof.ts @@ -3,9 +3,9 @@ import { result } from './result.js'; import { TypeMapping } from './types.js'; export function mapInstanceof(type: new (...args: never[]) => T): TypeMapping { - return createMapping(value => { - return value instanceof type - ? result.success(value) - : result.failed; + return createMapping((value) => { + return value instanceof type ? + result.success(value) : + result.failed; }); } diff --git a/api/utils/mapping/mapJObject.ts b/api/utils/mapping/mapJObject.ts index 7bfdfbe..462d43b 100644 --- a/api/utils/mapping/mapJObject.ts +++ b/api/utils/mapping/mapJObject.ts @@ -2,7 +2,7 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; import { TypeMapping } from './types.js'; -export const mapJObject: TypeMapping = createMapping(value => { +export const mapJObject: TypeMapping = createMapping((value) => { switch (typeof value) { case 'object': if (!Array.isArray(value) && value !== null) diff --git a/api/utils/mapping/mapJToken.ts b/api/utils/mapping/mapJToken.ts index 30e97d1..516c991 100644 --- a/api/utils/mapping/mapJToken.ts +++ b/api/utils/mapping/mapJToken.ts @@ -2,7 +2,7 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; import { TypeMapping } from './types.js'; -export const mapJToken: TypeMapping = createMapping(value => { +export const mapJToken: TypeMapping = createMapping((value) => { switch (typeof value) { case 'bigint': case 'symbol': diff --git a/api/utils/mapping/mapJson.ts b/api/utils/mapping/mapJson.ts index 36cbf5a..a23c533 100644 --- a/api/utils/mapping/mapJson.ts +++ b/api/utils/mapping/mapJson.ts @@ -3,7 +3,7 @@ import { result } from './result.js'; import { TypeMapping, TypeMappingImpl } from './types.js'; export function mapJson(mapping: TypeMappingImpl): TypeMapping { - return createMapping(value => { + return createMapping((value) => { if (typeof value !== 'string') return result.failed; try { diff --git a/api/utils/mapping/mapNumber.ts b/api/utils/mapping/mapNumber.ts index 25b6cb7..d539373 100644 --- a/api/utils/mapping/mapNumber.ts +++ b/api/utils/mapping/mapNumber.ts @@ -2,8 +2,8 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; import { TypeMapping } from './types.js'; -export const mapNumber: TypeMapping = createMapping(value => { - return typeof value === 'number' - ? result.success(value) - : result.failed; +export const mapNumber: TypeMapping = createMapping((value) => { + return typeof value === 'number' ? + result.success(value) : + result.failed; }); diff --git a/api/utils/mapping/mapObject.ts b/api/utils/mapping/mapObject.ts index a80e298..56e1d31 100644 --- a/api/utils/mapping/mapObject.ts +++ b/api/utils/mapping/mapObject.ts @@ -3,11 +3,11 @@ import { result } from './result.js'; import { TypeMapping, TypeMappingImpl, TypeMappings } from './types.js'; export function mapObject(mappings: TypeMappings, options?: { initial?: () => Partial; strict: boolean; }): TypeMapping { - return createMapping(value => { + return createMapping((value) => { if (value === undefined || typeof value !== 'object' || value === null) return result.failed; - const objValue = >value; + const objValue = value as Record; const mapped: Partial = options?.initial?.() ?? {}; const remainingKeys = new Set(Object.keys(objValue)); @@ -18,21 +18,21 @@ export function mapObject(mappings: TypeMappings, options?: { initial?: () const mappedProp = mapping(val); if (!mappedProp.valid) return false; - if (mappedProp.value !== undefined) + if (mappedProp.value as unknown !== undefined) mapped[resultKey] = mappedProp.value; return true; } for (const resultKey of Object.keys(mappings)) { const mapping = mappings[resultKey]; - if (!checkKey(resultKey, ...splitMapping(resultKey, mapping))) + if (!checkKey(resultKey, ...splitMapping((resultKey as keyof T), mapping))) return result.failed; } if (options?.strict !== false && remainingKeys.size > 0) return result.failed; - return result.success(mapped); + return result.success((mapped as T)); }); } diff --git a/api/utils/mapping/mapRecord.ts b/api/utils/mapping/mapRecord.ts index e7b7fe3..698c202 100644 --- a/api/utils/mapping/mapRecord.ts +++ b/api/utils/mapping/mapRecord.ts @@ -3,7 +3,7 @@ import { result } from './result.js'; import { TypeMapping, TypeMappingImpl } from './types.js'; export function mapRecord(mapping: TypeMappingImpl, initial?: () => Record): TypeMapping> { - return createMapping(value => { + return createMapping((value) => { if (value === undefined || typeof value !== 'object' || value === null) return result.failed; diff --git a/api/utils/mapping/mapRegex.ts b/api/utils/mapping/mapRegex.ts index 081af65..6bd0357 100644 --- a/api/utils/mapping/mapRegex.ts +++ b/api/utils/mapping/mapRegex.ts @@ -3,9 +3,9 @@ import { result } from './result.js'; import { TypeMapping } from './types.js'; export function mapRegex(regex: RegExp): TypeMapping { - return createMapping(value => { + return createMapping((value) => { if (typeof value === 'string' && regex.test(value)) - return result.success(value); + return result.success((value as T)); return result.failed; }); } diff --git a/api/utils/mapping/mapString.ts b/api/utils/mapping/mapString.ts index fa2f852..c233376 100644 --- a/api/utils/mapping/mapString.ts +++ b/api/utils/mapping/mapString.ts @@ -2,7 +2,7 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; import { TypeMapping } from './types.js'; -export const mapString: TypeMapping = createMapping(value => { +export const mapString: TypeMapping = createMapping((value) => { switch (typeof value) { case 'string': return result.success(value); // fallthrough diff --git a/api/utils/mapping/mapTuple.ts b/api/utils/mapping/mapTuple.ts index bba767c..9e23965 100644 --- a/api/utils/mapping/mapTuple.ts +++ b/api/utils/mapping/mapTuple.ts @@ -4,7 +4,7 @@ import { TypeMapping, TypeMappingImpl } from './types.js'; type TupleTypeMapping = { [P in keyof T]: TypeMappingImpl } & { length: T['length']; }; export function mapTuple(mappings: TupleTypeMapping): TypeMapping { - return createMapping(value => { + return createMapping((value) => { if (!Array.isArray(value)) return result.failed; diff --git a/api/utils/mapping/mapTypeof.ts b/api/utils/mapping/mapTypeof.ts index 7d8b158..d9880d9 100644 --- a/api/utils/mapping/mapTypeof.ts +++ b/api/utils/mapping/mapTypeof.ts @@ -3,14 +3,14 @@ import { result } from './result.js'; import { TypeMapping } from './types.js'; export function mapTypeof(typeofStr: T): TypeMapping { - return createMapping(v => { + return createMapping((v) => { if (v === undefined || v === null || typeof v !== typeofStr) return result.failed; return result.success(v as TypeofMapping[T]); }); } -export type TypeofMapping = { +export interface TypeofMapping { 'string': string; 'number': number; 'boolean': boolean; diff --git a/api/utils/mapping/mapUnknown.ts b/api/utils/mapping/mapUnknown.ts index fc21c67..f9014fe 100644 --- a/api/utils/mapping/mapUnknown.ts +++ b/api/utils/mapping/mapUnknown.ts @@ -2,4 +2,4 @@ import { createMapping } from './createMapping.js'; import { result } from './result.js'; import { TypeMapping } from './types.js'; -export const mapUnknown: TypeMapping = createMapping(value => result.success(value)); +export const mapUnknown: TypeMapping = createMapping((value) => result.success(value)); diff --git a/api/yarn.lock b/api/yarn.lock index 413f4f4..d06456f 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -29,21 +29,42 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/runtime@^7.23.2": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" - integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== +"@babel/runtime@^7.23.9": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e" + integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw== dependencies: regenerator-runtime "^0.14.0" -"@eslint-community/eslint-utils@^4.2.0": +"@colors/colors@1.6.0", "@colors/colors@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + +"@dabh/diagnostics@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" + integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + +"@emnapi/runtime@^0.45.0": + version "0.45.0" + resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-0.45.0.tgz#e754de04c683263f34fd0c7f32adfe718bbe4ddd" + integrity sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w== + dependencies: + tslib "^2.4.0" + +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1": +"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": version "4.10.0" resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== @@ -63,12 +84,40 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.56.0": - version "8.56.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" - integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== + +"@fastify/ajv-compiler@^3.5.0": + version "3.5.0" + resolved "https://registry.yarnpkg.com/@fastify/ajv-compiler/-/ajv-compiler-3.5.0.tgz#459bff00fefbf86c96ec30e62e933d2379e46670" + integrity sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA== + dependencies: + ajv "^8.11.0" + ajv-formats "^2.1.1" + fast-uri "^2.0.0" + +"@fastify/error@^3.3.0", "@fastify/error@^3.4.0": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@fastify/error/-/error-3.4.1.tgz#b14bb4cac3dd4ec614becbc643d1511331a6425c" + integrity sha512-wWSvph+29GR783IhmvdwWnN4bUxTD01Vm5Xad4i7i1VuAOItLvbPAb69sb0IQ2N57yprvhNIwAP5B6xfKTmjmQ== -"@humanwhocodes/config-array@^0.11.13": +"@fastify/fast-json-stringify-compiler@^4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.3.0.tgz#5df89fa4d1592cbb8780f78998355feb471646d5" + integrity sha512-aZAXGYo6m22Fk1zZzEUKBvut/CIIQe/BapEORnxiD5Qr0kPHqqI69NtEMCme74h+at72sPhbkb4ZrLd1W3KRLA== + dependencies: + fast-json-stringify "^5.7.0" + +"@fastify/merge-json-schemas@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz#3551857b8a17a24e8c799e9f51795edb07baa0bc" + integrity sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA== + dependencies: + fast-deep-equal "^3.1.3" + +"@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== @@ -87,6 +136,119 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== +"@img/sharp-darwin-arm64@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.2.tgz#0a52a82c2169112794dac2c71bfba9e90f7c5bd1" + integrity sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w== + optionalDependencies: + "@img/sharp-libvips-darwin-arm64" "1.0.1" + +"@img/sharp-darwin-x64@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.2.tgz#982e26bb9d38a81f75915c4032539aed621d1c21" + integrity sha512-/rK/69Rrp9x5kaWBjVN07KixZanRr+W1OiyKdXcbjQD6KbW+obaTeBBtLUAtbBsnlTTmWthw99xqoOS7SsySDg== + optionalDependencies: + "@img/sharp-libvips-darwin-x64" "1.0.1" + +"@img/sharp-libvips-darwin-arm64@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.1.tgz#81e83ffc2c497b3100e2f253766490f8fad479cd" + integrity sha512-kQyrSNd6lmBV7O0BUiyu/OEw9yeNGFbQhbxswS1i6rMDwBBSX+e+rPzu3S+MwAiGU3HdLze3PanQ4Xkfemgzcw== + +"@img/sharp-libvips-darwin-x64@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.1.tgz#fc1fcd9d78a178819eefe2c1a1662067a83ab1d6" + integrity sha512-eVU/JYLPVjhhrd8Tk6gosl5pVlvsqiFlt50wotCvdkFGf+mDNBJxMh+bvav+Wt3EBnNZWq8Sp2I7XfSjm8siog== + +"@img/sharp-libvips-linux-arm64@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.1.tgz#26eb8c556a9b0db95f343fc444abc3effb67ebcf" + integrity sha512-bnGG+MJjdX70mAQcSLxgeJco11G+MxTz+ebxlz8Y3dxyeb3Nkl7LgLI0mXupoO+u1wRNx/iRj5yHtzA4sde1yA== + +"@img/sharp-libvips-linux-arm@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.1.tgz#2a377b959ff7dd6528deee486c25461296a4fa8b" + integrity sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ== + +"@img/sharp-libvips-linux-s390x@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.1.tgz#af28ac9ba929204467ecdf843330d791e9421e10" + integrity sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ== + +"@img/sharp-libvips-linux-x64@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.1.tgz#4273d182aa51912e655e1214ea47983d7c1f7f8d" + integrity sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw== + +"@img/sharp-libvips-linuxmusl-arm64@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.1.tgz#d150c92151cea2e8d120ad168b9c358d09c77ce8" + integrity sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg== + +"@img/sharp-libvips-linuxmusl-x64@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.1.tgz#e297c1a4252c670d93b0f9e51fca40a7a5b6acfd" + integrity sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw== + +"@img/sharp-linux-arm64@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.2.tgz#af3409f801a9bee1d11d0c7e971dcd6180f80022" + integrity sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew== + optionalDependencies: + "@img/sharp-libvips-linux-arm64" "1.0.1" + +"@img/sharp-linux-arm@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.2.tgz#181f7466e6ac074042a38bfb679eb82505e17083" + integrity sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA== + optionalDependencies: + "@img/sharp-libvips-linux-arm" "1.0.1" + +"@img/sharp-linux-s390x@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.2.tgz#9c171f49211f96fba84410b3e237b301286fa00f" + integrity sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA== + optionalDependencies: + "@img/sharp-libvips-linux-s390x" "1.0.1" + +"@img/sharp-linux-x64@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.2.tgz#b956dfc092adc58c2bf0fae2077e6f01a8b2d5d7" + integrity sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A== + optionalDependencies: + "@img/sharp-libvips-linux-x64" "1.0.1" + +"@img/sharp-linuxmusl-arm64@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.2.tgz#10e0ec5a79d1234c6a71df44c9f3b0bef0bc0f15" + integrity sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA== + optionalDependencies: + "@img/sharp-libvips-linuxmusl-arm64" "1.0.1" + +"@img/sharp-linuxmusl-x64@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.2.tgz#29e0030c24aa27c38201b1fc84e3d172899fcbe0" + integrity sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A== + optionalDependencies: + "@img/sharp-libvips-linuxmusl-x64" "1.0.1" + +"@img/sharp-wasm32@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.2.tgz#38d7c740a22de83a60ad1e6bcfce17462b0d4230" + integrity sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ== + dependencies: + "@emnapi/runtime" "^0.45.0" + +"@img/sharp-win32-ia32@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.2.tgz#09456314e223f68e5417c283b45c399635c16202" + integrity sha512-okBpql96hIGuZ4lN3+nsAjGeggxKm7hIRu9zyec0lnfB8E7Z6p95BuRZzDDXZOl2e8UmR4RhYt631i7mfmKU8g== + +"@img/sharp-win32-x64@0.33.2": + version "0.33.2" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.2.tgz#148e96dfd6e68747da41a311b9ee4559bb1b1471" + integrity sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg== + "@mapbox/node-pre-gyp@^1.0.0": version "1.0.11" resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa" @@ -123,22 +285,95 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@prisma/client@^4.7.1": - version "4.16.2" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.16.2.tgz#3bb9ebd49b35c8236b3d468d0215192267016e2b" - integrity sha512-qCoEyxv1ZrQ4bKy39GnylE8Zq31IRmm8bNhNbZx7bF2cU5aiCCnSa93J2imF88MBjn7J9eUQneNxUQVJdl/rPQ== +"@prisma/client@^5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.10.2.tgz#e087b40a4de8e3171eb9cbf0a873465cd2068e17" + integrity sha512-ef49hzB2yJZCvM5gFHMxSFL9KYrIP9udpT5rYo0CsHD4P9IKj473MbhU1gjKKftiwWBTIyrt9jukprzZXazyag== + +"@prisma/debug@5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.10.2.tgz#74be81d8969978f4d53c1b4e76d61f04bfbc3951" + integrity sha512-bkBOmH9dpEBbMKFJj8V+Zp8IZHIBjy3fSyhLhxj4FmKGb/UBSt9doyfA6k1UeUREsMJft7xgPYBbHSOYBr8XCA== + +"@prisma/engines-version@5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9": + version "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9.tgz#1502335d4d72d2014cb25b8ad8a740a3a13400ea" + integrity sha512-uCy/++3Jx/O3ufM+qv2H1L4tOemTNqcP/gyEVOlZqTpBvYJUe0tWtW0y3o2Ueq04mll4aM5X3f6ugQftOSLdFQ== + +"@prisma/engines@5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.10.2.tgz#a4851d90f76ad6d22e783d5fd2e2e8c0640f1e81" + integrity sha512-HkSJvix6PW8YqEEt3zHfCYYJY69CXsNdhU+wna+4Y7EZ+AwzeupMnUThmvaDA7uqswiHkgm5/SZ6/4CStjaGmw== + dependencies: + "@prisma/debug" "5.10.2" + "@prisma/engines-version" "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" + "@prisma/fetch-engine" "5.10.2" + "@prisma/get-platform" "5.10.2" + +"@prisma/fetch-engine@5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.10.2.tgz#a061f6727d395c7033b55f9c6e92f8741a70d5c5" + integrity sha512-dSmXcqSt6DpTmMaLQ9K8ZKzVAMH3qwGCmYEZr/uVnzVhxRJ1EbT/w2MMwIdBNq1zT69Rvh0h75WMIi0mrIw7Hg== + dependencies: + "@prisma/debug" "5.10.2" + "@prisma/engines-version" "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" + "@prisma/get-platform" "5.10.2" + +"@prisma/get-platform@5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.10.2.tgz#7af97b1d82e5574a474e3fbf6eaf04f4156bc535" + integrity sha512-nqXP6vHiY2PIsebBAuDeWiUYg8h8mfjBckHh6Jezuwej0QJNnjDiOq30uesmg+JXxGk99nqyG3B7wpcOODzXvg== + dependencies: + "@prisma/debug" "5.10.2" + +"@stylistic/eslint-plugin-js@1.6.3", "@stylistic/eslint-plugin-js@^1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-1.6.3.tgz#1111d42a81e9f827fdb3f1e09292af0682e37e1d" + integrity sha512-ckdz51oHxD2FaxgY2piJWJVJiwgp8Uu96s+as2yB3RMwavn3nHBrpliVukXY9S/DmMicPRB2+H8nBk23GDG+qA== + dependencies: + "@types/eslint" "^8.56.2" + acorn "^8.11.3" + escape-string-regexp "^4.0.0" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" + +"@stylistic/eslint-plugin-jsx@1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-jsx/-/eslint-plugin-jsx-1.6.3.tgz#6560eca8de9ada77d3b4eeb4a6805b49dc4b7c29" + integrity sha512-SRysCIg59Zvn3dJPqHziiHwuni4NNj1et5stAmivmyQ3Cdp2ULCB7tGxCF1OxpkwRlZQue3ZgdiM7EXfJKaf9w== dependencies: - "@prisma/engines-version" "4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81" + "@stylistic/eslint-plugin-js" "^1.6.3" + "@types/eslint" "^8.56.2" + estraverse "^5.3.0" + picomatch "^4.0.1" -"@prisma/engines-version@4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81": - version "4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.16.1-1.4bc8b6e1b66cb932731fb1bdbbc550d1e010de81.tgz#d3b5dcf95b6d220e258cbf6ae19b06d30a7e9f14" - integrity sha512-q617EUWfRIDTriWADZ4YiWRZXCa/WuhNgLTVd+HqWLffjMSPzyM5uOWoauX91wvQClSKZU4pzI4JJLQ9Kl62Qg== +"@stylistic/eslint-plugin-plus@1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-plus/-/eslint-plugin-plus-1.6.3.tgz#faeb346025e47faf05e016951bb9f4e4c87a016b" + integrity sha512-TuwQOdyVGycDPw5XeF7W4f3ZonAVzOAzORSaD2yGAJ0fRAbJ+l/v3CkKzIAqBBwWkc+c2aRMsWtLP2+viBnmlQ== + dependencies: + "@types/eslint" "^8.56.2" + "@typescript-eslint/utils" "^6.21.0" -"@prisma/engines@4.16.2": - version "4.16.2" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.16.2.tgz#5ec8dd672c2173d597e469194916ad4826ce2e5f" - integrity sha512-vx1nxVvN4QeT/cepQce68deh/Turxy5Mr+4L4zClFuK1GlxN3+ivxfuv+ej/gvidWn1cE1uAhW7ALLNlYbRUAw== +"@stylistic/eslint-plugin-ts@1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-1.6.3.tgz#4829ca62446d1005f99e5ce9e7ec8588737cc0d1" + integrity sha512-v5GwZsPLblWM9uAIdaSi31Sed3XBWlTFQJ3b5upEmj6QsKYivA5nmIYutwqqL133QdVWjmC86pINlx2Muq3uNQ== + dependencies: + "@stylistic/eslint-plugin-js" "1.6.3" + "@types/eslint" "^8.56.2" + "@typescript-eslint/utils" "^6.21.0" + +"@stylistic/eslint-plugin@^1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-1.6.3.tgz#7d3e8009370d093de0306a116b9a8b15dabe2ff6" + integrity sha512-WDa4FjhImp7YcztRaMG09svhKYYhi2Hc4p9ltQRSqyB4fsUUFm+GKzStqqH7xfjHnxacMJaOnaMGRTUqIIZDLA== + dependencies: + "@stylistic/eslint-plugin-js" "1.6.3" + "@stylistic/eslint-plugin-jsx" "1.6.3" + "@stylistic/eslint-plugin-plus" "1.6.3" + "@stylistic/eslint-plugin-ts" "1.6.3" + "@types/eslint" "^8.56.2" "@tokenizer/token@^0.3.0": version "0.3.0" @@ -198,10 +433,23 @@ dependencies: "@types/node" "*" -"@types/delta-e@^0.0.0": - version "0.0.0" - resolved "https://registry.yarnpkg.com/@types/delta-e/-/delta-e-0.0.0.tgz#f2d99a1613995631f39d2494757559bd634a675c" - integrity sha512-ePlXUpSy1oU/JOayGaAoyVDoQB1m1gguj8k+gxASP6+uutrwaKobWwyTZOzUIJ9fqI4wxfHKmBTx2ogP7uMv7w== +"@types/delta-e@^0.0.2": + version "0.0.2" + resolved "https://registry.yarnpkg.com/@types/delta-e/-/delta-e-0.0.2.tgz#fa7d1e7d4525b6536fb125334f22343a16277994" + integrity sha512-DLvqCZ+ce6qVLp8HIxx8rrLjog1t0NlSLXOzz2FbYC31xHMSADMEz+MrJTvYTeuHez6Wtm0dDYgGtBY+7Dgf4Q== + +"@types/eslint@^8.56.2": + version "8.56.5" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.5.tgz#94b88cab77588fcecdd0771a6d576fa1c0af9d02" + integrity sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== "@types/express-serve-static-core@^4.17.33": version "4.17.43" @@ -228,7 +476,7 @@ resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f" integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA== -"@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -238,6 +486,11 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@types/lodash@^4.14.199": + version "4.14.202" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" + integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ== + "@types/mime-types@^2.1.1": version "2.1.4" resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.4.tgz#93a1933e24fed4fb9e4adc5963a63efcbb3317a2" @@ -274,16 +527,16 @@ "@types/node" "*" "@types/node@*": - version "20.11.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.16.tgz#4411f79411514eb8e2926f036c86c9f0e4ec6708" - integrity sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ== + version "20.11.24" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792" + integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long== dependencies: undici-types "~5.26.4" "@types/node@^16.11.38": - version "16.18.79" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.79.tgz#153e25561b271cf87dc1b28d38f98cebd514d788" - integrity sha512-Qd7jdLR5zmnIyMhfDrfPqN5tUCvreVpP3Qrf2oSM+F7SNzlb/MwHISGUkdFHtevfkPJ3iAGyeQI/jsbh9EStgQ== + version "16.18.86" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.86.tgz#87426ce3747a4c135229e15765cbf9c5a18d280c" + integrity sha512-QMvdZf+ZTSiv7gspwhqbfB7Y5DmbYgCsUnakS8Ul9uRbJQehDKaM7SL+GbcDS003Lh7VK4YlelHsRm9HCv26eA== "@types/normalize-package-data@^2.4.0": version "2.4.4" @@ -296,9 +549,9 @@ integrity sha512-O2M2x1w+m7gWLen8i5DOy6tWRnbRcsW6Pke3j3HAsJUrPb4g0MgjksIUm2aqUtCYxy7Qjr3CzjjwQBzhiGn46A== "@types/pg@^8.6.5": - version "8.11.0" - resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.11.0.tgz#355a07531d467f2e4fabaa78be087ce2d99fd862" - integrity sha512-sDAlRiBNthGjNFfvt0k6mtotoVYVQ63pA8R4EMWka7crawSR60waVYR0HAgmPRs/e2YaeJTD/43OoZ3PFw80pw== + version "8.11.2" + resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.11.2.tgz#e5c306601d2e0cc54c0801cc61a41761c8a95c92" + integrity sha512-G2Mjygf2jFMU/9hCaTYxJrwdObdcnuQde1gndooZSOHsNSaCehAuwc7EIuSA34Do8Jx2yZ19KtvW8P0j4EuUXw== dependencies: "@types/node" "*" pg-protocol "*" @@ -319,6 +572,11 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== +"@types/semver@^7.5.0": + version "7.5.8" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" + integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== + "@types/send@*": version "0.17.4" resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" @@ -336,17 +594,15 @@ "@types/mime" "*" "@types/node" "*" -"@types/sharp@^0.31.0": - version "0.31.1" - resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.31.1.tgz#db768461455dbcf9ff11d69277fd70564483c4df" - integrity sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag== - dependencies: - "@types/node" "*" +"@types/triple-beam@^1.3.2": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" + integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw== -"@types/uuid@^8.3.4": - version "8.3.4" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" - integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== +"@types/uuid@^9.0.8": + version "9.0.8" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba" + integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA== "@types/ws@^8.5.4": version "8.5.10" @@ -355,30 +611,39 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^5.43.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" - integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== - dependencies: - "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/type-utils" "5.62.0" - "@typescript-eslint/utils" "5.62.0" +"@typescript-eslint/eslint-plugin@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz#22bb999a8d59893c0ea07923e8a21f9d985ad740" + integrity sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w== + dependencies: + "@eslint-community/regexpp" "^4.5.1" + "@typescript-eslint/scope-manager" "7.1.0" + "@typescript-eslint/type-utils" "7.1.0" + "@typescript-eslint/utils" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" debug "^4.3.4" graphemer "^1.4.0" - ignore "^5.2.0" - natural-compare-lite "^1.4.0" - semver "^7.3.7" - tsutils "^3.21.0" + ignore "^5.2.4" + natural-compare "^1.4.0" + semver "^7.5.4" + ts-api-utils "^1.0.1" -"@typescript-eslint/parser@^5.48.1": +"@typescript-eslint/experimental-utils@^5.54.1": version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" - integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz#14559bf73383a308026b427a4a6129bae2146741" + integrity sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw== dependencies: - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" + "@typescript-eslint/utils" "5.62.0" + +"@typescript-eslint/parser@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.1.0.tgz#b89dab90840f7d2a926bf4c23b519576e8c31970" + integrity sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w== + dependencies: + "@typescript-eslint/scope-manager" "7.1.0" + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/typescript-estree" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.62.0": @@ -389,21 +654,47 @@ "@typescript-eslint/types" "5.62.0" "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/type-utils@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a" - integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew== +"@typescript-eslint/scope-manager@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1" + integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg== dependencies: - "@typescript-eslint/typescript-estree" "5.62.0" - "@typescript-eslint/utils" "5.62.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" + +"@typescript-eslint/scope-manager@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz#e4babaa39a3d612eff0e3559f3e99c720a2b4a54" + integrity sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A== + dependencies: + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" + +"@typescript-eslint/type-utils@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz#372dfa470df181bcee0072db464dc778b75ed722" + integrity sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew== + dependencies: + "@typescript-eslint/typescript-estree" "7.1.0" + "@typescript-eslint/utils" "7.1.0" debug "^4.3.4" - tsutils "^3.21.0" + ts-api-utils "^1.0.1" "@typescript-eslint/types@5.62.0": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== +"@typescript-eslint/types@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" + integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== + +"@typescript-eslint/types@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.1.0.tgz#52a86d6236fda646e7e5fe61154991dc0dc433ef" + integrity sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA== + "@typescript-eslint/typescript-estree@5.62.0": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" @@ -417,6 +708,34 @@ semver "^7.3.7" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" + integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ== + dependencies: + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/visitor-keys" "6.21.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "9.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/typescript-estree@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz#419b1310f061feee6df676c5bed460537310c593" + integrity sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ== + dependencies: + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "9.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + "@typescript-eslint/utils@5.62.0": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" @@ -431,6 +750,32 @@ eslint-scope "^5.1.1" semver "^7.3.7" +"@typescript-eslint/utils@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.1.0.tgz#710ecda62aff4a3c8140edabf3c5292d31111ddd" + integrity sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "7.1.0" + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/typescript-estree" "7.1.0" + semver "^7.5.4" + +"@typescript-eslint/utils@^6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" + integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "6.21.0" + "@typescript-eslint/types" "6.21.0" + "@typescript-eslint/typescript-estree" "6.21.0" + semver "^7.5.4" + "@typescript-eslint/visitor-keys@5.62.0": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" @@ -439,6 +784,22 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" +"@typescript-eslint/visitor-keys@6.21.0": + version "6.21.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47" + integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A== + dependencies: + "@typescript-eslint/types" "6.21.0" + eslint-visitor-keys "^3.4.1" + +"@typescript-eslint/visitor-keys@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz#576c4ad462ca1378135a55e2857d7aced96ce0a0" + integrity sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA== + dependencies: + "@typescript-eslint/types" "7.1.0" + eslint-visitor-keys "^3.4.1" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" @@ -449,6 +810,18 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +abstract-logging@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" + integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== + accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" @@ -462,7 +835,7 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^8.9.0: +acorn@^8.11.3, acorn@^8.9.0: version "8.11.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== @@ -482,6 +855,13 @@ aggregate-error@^4.0.0: clean-stack "^4.0.0" indent-string "^5.0.0" +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -492,6 +872,16 @@ ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.0, ajv@^8.10.0, ajv@^8.11.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -516,6 +906,11 @@ ansi-styles@^4.1.0: resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw== + are-we-there-yet@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" @@ -607,15 +1002,37 @@ arrify@^1.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== +async@^3.2.3: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +atomic-sleep@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" + integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== + available-typed-arrays@^1.0.5, available-typed-arrays@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz#ac812d8ce5a6b976d738e1c45f08d0b00bc7d725" - integrity sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg== + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" + +avvio@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/avvio/-/avvio-8.3.0.tgz#1e019433d935730b814978a583eefac41a65082f" + integrity sha512-VBVH0jubFr9LdFASy/vNtm5giTrnbVquWBhT0fyizuNK2rQ7e7ONU2plZQWUNqtE1EmxFEb+kbSkFRkstiaS9Q== + dependencies: + "@fastify/error" "^3.3.0" + archy "^1.0.0" + debug "^4.0.0" + fastq "^1.17.1" balanced-match@^1.0.0: version "1.0.2" @@ -627,22 +1044,13 @@ base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -body-parser@1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== +body-parser@1.20.2: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== dependencies: bytes "3.1.2" - content-type "~1.0.4" + content-type "~1.0.5" debug "2.6.9" depd "2.0.0" destroy "1.2.0" @@ -650,7 +1058,7 @@ body-parser@1.20.1: iconv-lite "0.4.24" on-finished "2.4.1" qs "6.11.0" - raw-body "2.5.1" + raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -662,6 +1070,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -681,20 +1096,20 @@ buffer-writer@2.0.0: resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== dependencies: base64-js "^1.3.1" - ieee754 "^1.1.13" + ieee754 "^1.2.1" bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5: +call-bind@^1.0.2, call-bind@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== @@ -703,6 +1118,17 @@ call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5: get-intrinsic "^1.2.1" set-function-length "^1.1.1" +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -723,10 +1149,10 @@ camelcase@^6.3.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -canvas@2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.0.tgz#7f0c3e9ae94cf469269b5d3a7963a7f3a9936434" - integrity sha512-bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g== +canvas@2.11.2: + version "2.11.2" + resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.2.tgz#553d87b1e0228c7ac0fc72887c3adbac4abbd860" + integrity sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw== dependencies: "@mapbox/node-pre-gyp" "^1.0.0" nan "^2.17.0" @@ -762,11 +1188,6 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -779,7 +1200,7 @@ clean-stack@^4.0.0: dependencies: escape-string-regexp "5.0.0" -color-convert@^1.9.0: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -803,7 +1224,7 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.9.0: +color-string@^1.6.0, color-string@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== @@ -816,6 +1237,14 @@ color-support@^1.1.2: resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== +color@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== + dependencies: + color-convert "^1.9.3" + color-string "^1.6.0" + color@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a" @@ -824,6 +1253,14 @@ color@^4.2.3: color-convert "^2.0.1" color-string "^1.9.0" +colorspace@1.1.x: + version "1.1.4" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== + dependencies: + color "^3.1.3" + text-hex "1.0.x" + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -860,7 +1297,7 @@ content-disposition@0.5.4: dependencies: safe-buffer "5.2.1" -content-type@~1.0.4: +content-type@~1.0.4, content-type@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== @@ -875,6 +1312,11 @@ cookie@0.5.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== +cookie@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== + cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -901,7 +1343,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -945,24 +1387,12 @@ decompress-response@^4.2.0: dependencies: mimic-response "^2.0.0" -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -define-data-property@^1.0.1, define-data-property@^1.1.1: +define-data-property@^1.0.1: version "1.1.1" resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== @@ -971,6 +1401,15 @@ define-data-property@^1.0.1, define-data-property@^1.1.1: gopd "^1.0.1" has-property-descriptors "^1.0.0" +define-data-property@^1.1.2, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" @@ -1027,7 +1466,7 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-libc@^2.0.0, detect-libc@^2.0.1: +detect-libc@^2.0.0, detect-libc@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw== @@ -1054,9 +1493,9 @@ doctrine@^3.0.0: esutils "^2.0.2" dotenv@^16.0.3: - version "16.4.1" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.1.tgz#1d9931f1d3e5d2959350d1250efab299561f7f11" - integrity sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ== + version "16.4.5" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" + integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== ee-first@1.1.1: version "1.1.1" @@ -1073,18 +1512,16 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - enhanced-resolve@^5.12.0: version "5.15.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" @@ -1162,6 +1599,18 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.13" +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es-set-tostringtag@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" @@ -1264,15 +1713,24 @@ eslint-plugin-import@^2.26.0: semver "^6.3.1" tsconfig-paths "^3.15.0" -eslint-plugin-simple-import-sort@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz#a1dad262f46d2184a90095a60c66fef74727f0f8" - integrity sha512-U3vEDB5zhYPNfxT5TYR7u01dboFZp+HNpnGhkDB2g/2E4wZ/g1Q9Ton8UwCLfRV9yAKyYqDh62oHOamvkFxsvw== +eslint-plugin-require-extensions@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-require-extensions/-/eslint-plugin-require-extensions-0.1.3.tgz#394aeab433f996797a6ceba0a3f75640d4846bc8" + integrity sha512-T3c1PZ9PIdI3hjV8LdunfYI8gj017UQjzAnCrxuo3wAjneDbTPHdE3oNWInOjMA+z/aBkUtlW5vC0YepYMZIug== -eslint-plugin-sort@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-sort/-/eslint-plugin-sort-1.5.0.tgz#b91ee8498ca0795ef4821537e3e2e65bc5b44f2f" - integrity sha512-zKb/dVoHcsIvcqcCC2wUViNyaL/AMzwf5dO2PcQPh0WRFtEZyMzpF0FGvZRKHGowuvGiZnKnfpQldV2ZgmnMfQ== +eslint-plugin-simple-import-sort@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.0.0.tgz#3cfa05d74509bd4dc329a956938823812194dbb6" + integrity sha512-8o0dVEdAkYap0Cn5kNeklaKcT1nUsa3LITWEuFk3nJifOoD+5JQGoyDUW2W/iPWwBsNBJpyJS9y4je/BgxLcyQ== + +eslint-plugin-sort@^2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-sort/-/eslint-plugin-sort-2.11.0.tgz#45d8725a94de76a3f0212f16dd81abc4dc65a199" + integrity sha512-Rvt4XZI42KfyBvjvtcoKFEWg6L/nAKfMBagxKwipNfQd6zetwyHgh284XC1rlRzxY7scn0yfKgqdMILQIyKdlA== + dependencies: + "@typescript-eslint/experimental-utils" "^5.54.1" + isomorphic-resolve "^1.0.0" + natural-compare "^1.4.0" eslint-scope@^5.1.1: version "5.1.1" @@ -1296,15 +1754,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8.1.0: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" @@ -1367,7 +1825,7 @@ estraverse@^4.1.1: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== -estraverse@^5.1.0, estraverse@^5.2.0: +estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== @@ -1382,19 +1840,24 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + +events@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== express@^4.18.2: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== + version "4.18.3" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.3.tgz#6870746f3ff904dee1819b82e4b51509afffb0d4" + integrity sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.1" + body-parser "1.20.2" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.5.0" @@ -1424,6 +1887,16 @@ express@^4.18.2: utils-merge "1.0.1" vary "~1.1.2" +fast-content-type-parse@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fast-content-type-parse/-/fast-content-type-parse-1.1.0.tgz#4087162bf5af3294d4726ff29b334f72e3a1092c" + integrity sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ== + +fast-decode-uri-component@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" + integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg== + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -1445,18 +1918,75 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== +fast-json-stringify@^5.7.0, fast-json-stringify@^5.8.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-5.12.0.tgz#e9f77dc0b4face74351320c3618f1d869de5cb18" + integrity sha512-7Nnm9UPa7SfHRbHVA1kJQrGXCRzB7LMlAAqHXQFkEQqueJm1V8owm0FsE/2Do55/4CcdhwiLQERaKomOnKQkyA== + dependencies: + "@fastify/merge-json-schemas" "^0.1.0" + ajv "^8.10.0" + ajv-formats "^2.1.1" + fast-deep-equal "^3.1.3" + fast-uri "^2.1.0" + json-schema-ref-resolver "^1.0.1" + rfdc "^1.2.0" + fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fastq@^1.6.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.0.tgz#ca5e1a90b5e68f97fc8b61330d5819b82f5fab03" - integrity sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w== +fast-querystring@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53" + integrity sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg== + dependencies: + fast-decode-uri-component "^1.0.1" + +fast-redact@^3.1.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.3.0.tgz#7c83ce3a7be4898241a46560d51de10f653f7634" + integrity sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ== + +fast-uri@^2.0.0, fast-uri@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.3.0.tgz#bdae493942483d299e7285dcb4627767d42e2793" + integrity sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw== + +fastify@^4.23.2: + version "4.26.1" + resolved "https://registry.yarnpkg.com/fastify/-/fastify-4.26.1.tgz#91b11565d2533b7e83d267ad8998c39d263e0279" + integrity sha512-tznA/G55dsxzM5XChBfcvVSloG2ejeeotfPPJSFaWmHyCDVGMpvf3nRNbsCb/JTBF9RmQFBfuujWt3Nphjesng== + dependencies: + "@fastify/ajv-compiler" "^3.5.0" + "@fastify/error" "^3.4.0" + "@fastify/fast-json-stringify-compiler" "^4.3.0" + abstract-logging "^2.0.1" + avvio "^8.3.0" + fast-content-type-parse "^1.1.0" + fast-json-stringify "^5.8.0" + find-my-way "^8.0.0" + light-my-request "^5.11.0" + pino "^8.17.0" + process-warning "^3.0.0" + proxy-addr "^2.0.7" + rfdc "^1.3.0" + secure-json-parse "^2.7.0" + semver "^7.5.4" + toad-cache "^3.3.0" + +fastq@^1.17.1, fastq@^1.6.0: + version "1.17.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" + integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== dependencies: reusify "^1.0.4" +fecha@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" + integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== + fetch-blob@^3.1.2, fetch-blob@^3.1.4: version "3.2.0" resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9" @@ -1501,6 +2031,15 @@ finalhandler@1.2.0: statuses "2.0.1" unpipe "~1.0.0" +find-my-way@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-8.1.0.tgz#cc05e8e4b145322299d0de0a839b5be528c2083e" + integrity sha512-41QwjCGcVTODUmLLqTMeoHeiozbMXYMAE1CKFiDyi9zVZ2Vjh0yz3MF0WQZoIb+cmzP/XlbFjlF2NtJmvZHznA== + dependencies: + fast-deep-equal "^3.1.3" + fast-querystring "^1.0.0" + safe-regex2 "^2.0.0" + find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -1519,9 +2058,14 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" - integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== + +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== for-each@^0.3.3: version "0.3.3" @@ -1561,11 +2105,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -1613,7 +2152,7 @@ gauge@^3.0.0: strip-ansi "^6.0.1" wide-align "^1.1.2" -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: +get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== @@ -1623,6 +2162,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@ has-symbols "^1.0.3" hasown "^2.0.0" +get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" @@ -1638,11 +2188,6 @@ get-tsconfig@^4.5.0: dependencies: resolve-pkg-maps "^1.0.0" -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== - glob-parent@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -1750,10 +2295,17 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: dependencies: get-intrinsic "^1.2.2" +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" @@ -1773,9 +2325,9 @@ has-unicode@^2.0.1: integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== + version "2.0.1" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" + integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== dependencies: function-bind "^1.1.2" @@ -1812,7 +2364,7 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -ieee754@^1.1.13, ieee754@^1.2.1: +ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -1848,16 +2400,11 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - internal-slot@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" @@ -1993,6 +2540,11 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" @@ -2031,6 +2583,11 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== +isomorphic-resolve@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isomorphic-resolve/-/isomorphic-resolve-1.0.0.tgz#477ef131eda1212c2e896883b564d9ac40e749ce" + integrity sha512-FWn6176keSYAapzv5P6ZzLdbCXj5uaG49h1y+EXRNqZm2RBztzBOYqCMmSe4Dmo+bIvk7sX/SN4pI/3QmfH3aw== + javascript-natural-sort@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" @@ -2068,11 +2625,23 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== +json-schema-ref-resolver@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz#6586f483b76254784fc1d2120f717bdc9f0a99bf" + integrity sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw== + dependencies: + fast-deep-equal "^3.1.3" + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -2102,6 +2671,11 @@ kind-of@^6.0.3: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== + levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -2110,6 +2684,15 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" +light-my-request@^5.11.0: + version "5.11.1" + resolved "https://registry.yarnpkg.com/light-my-request/-/light-my-request-5.11.1.tgz#9bbb993039ff5ccdcdcff359c39892a3fac9bdcd" + integrity sha512-KXAh2m6VRlkWCk2KfmHE7tLBXKh30JE0tXUJY4dNxje4oLmPKUqlUfImiEQZLphx+Z9KTQcVv4DjGnJxkVOIbA== + dependencies: + cookie "^0.6.0" + process-warning "^2.0.0" + set-cookie-parser "^2.4.1" + lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -2127,6 +2710,23 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +logform@^2.3.2, logform@^2.4.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.0.tgz#8c82a983f05d6eaeb2d75e3decae7a768b2bf9b5" + integrity sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ== + dependencies: + "@colors/colors" "1.6.0" + "@types/triple-beam" "^1.3.2" + fecha "^4.2.0" + ms "^2.1.1" + safe-stable-stringify "^2.3.1" + triple-beam "^1.3.0" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -2151,12 +2751,12 @@ map-obj@^4.1.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -mathjs@^11.3.3: - version "11.12.0" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-11.12.0.tgz#e933e5941930d44763ddfc5bfb08b90059449b2c" - integrity sha512-UGhVw8rS1AyedyI55DGz9q1qZ0p98kyKPyc9vherBkoueLntPfKtPBh14x+V4cdUWK0NZV2TBwqRFlvadscSuw== +mathjs@^12.4.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-12.4.0.tgz#875c2ec19e5be69885b29769f78bbb37220322b6" + integrity sha512-4Moy0RNjwMSajEkGGxNUyMMC/CZAcl87WBopvNsJWB4E4EFebpTedr+0/rhqmnOSTH3Wu/3WfiWiw6mqiaHxVw== dependencies: - "@babel/runtime" "^7.23.2" + "@babel/runtime" "^7.23.9" complex.js "^2.1.1" decimal.js "^10.4.3" escape-latex "^1.2.0" @@ -2234,16 +2834,18 @@ mimic-response@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - min-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== +minimatch@9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -2260,7 +2862,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: +minimist@^1.2.0, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -2285,20 +2887,15 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== moment-timezone@^0.5.39: - version "0.5.44" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.44.tgz#a64a4e47b68a43deeab5ae4eb4f82da77cdf595f" - integrity sha512-nv3YpzI/8lkQn0U6RkLd+f0W/zy/JnoR5/EyPz/dNkPTBjA2jNLCVxaiQ8QpeLymhSZvX0wCL5s27NQWdOPwAw== + version "0.5.45" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c" + integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ== dependencies: moment "^2.29.4" @@ -2327,16 +2924,6 @@ nan@^2.17.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - -natural-compare-lite@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" - integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -2347,18 +2934,6 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -node-abi@^3.3.0: - version "3.54.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.54.0.tgz#f6386f7548817acac6434c6cba02999c9aebcc69" - integrity sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA== - dependencies: - semver "^7.3.5" - -node-addon-api@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762" - integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA== - node-domexception@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" @@ -2417,7 +2992,7 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.13.1, object-inspect@^1.9.0: +object-inspect@^1.13.1: version "1.13.1" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== @@ -2470,6 +3045,11 @@ obuf@~1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +on-exit-leak-free@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8" + integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA== + on-finished@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" @@ -2477,13 +3057,20 @@ on-finished@2.4.1: dependencies: ee-first "1.1.1" -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0, once@^1.3.1: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" + optionator@^0.9.3: version "0.9.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" @@ -2677,6 +3264,46 @@ picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +picomatch@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.1.tgz#68c26c8837399e5819edce48590412ea07f17a07" + integrity sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg== + +pino-abstract-transport@v1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8" + integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA== + dependencies: + readable-stream "^4.0.0" + split2 "^4.0.0" + +pino-std-serializers@^6.0.0: + version "6.2.2" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3" + integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA== + +pino@^8.17.0: + version "8.19.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.19.0.tgz#ccc15ef736f103ec02cfbead0912bc436dc92ce4" + integrity sha512-oswmokxkav9bADfJ2ifrvfHUwad6MLp73Uat0IkQWY3iAw5xTRoznXbXksZs8oaOUMpmhVWD+PZogNzllWpJaA== + dependencies: + atomic-sleep "^1.0.0" + fast-redact "^3.1.1" + on-exit-leak-free "^2.1.0" + pino-abstract-transport v1.1.0 + pino-std-serializers "^6.0.0" + process-warning "^3.0.0" + quick-format-unescaped "^4.0.3" + real-require "^0.2.0" + safe-stable-stringify "^2.3.1" + sonic-boom "^3.7.0" + thread-stream "^2.0.0" + +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postgres-array@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" @@ -2726,37 +3353,34 @@ postgres-range@^1.1.1: resolved "https://registry.yarnpkg.com/postgres-range/-/postgres-range-1.1.4.tgz#a59c5f9520909bcec5e63e8cf913a92e4c952863" integrity sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w== -prebuild-install@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" - integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== - dependencies: - detect-libc "^2.0.0" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^3.3.0" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^4.0.0" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prisma@^4.7.1: - version "4.16.2" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.16.2.tgz#469e0a0991c6ae5bcde289401726bb012253339e" - integrity sha512-SYCsBvDf0/7XSJyf2cHTLjLeTLVXYfqp7pG5eEVafFLeT0u/hLFz/9W196nDRGUOo1JfPatAEb+uEnTQImQC1g== +prisma@^5.10.2: + version "5.10.2" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.10.2.tgz#aa63085c49dc74cdb5c3816e8dd1fb4d74a2aadd" + integrity sha512-hqb/JMz9/kymRE25pMWCxkdyhbnIWrq+h7S6WysJpdnCvhstbJSNP/S6mScEcqiB8Qv2F+0R3yG+osRaWqZacQ== dependencies: - "@prisma/engines" "4.16.2" + "@prisma/engines" "5.10.2" + +process-warning@^2.0.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-2.3.2.tgz#70d8a3251aab0eafe3a595d8ae2c5d2277f096a5" + integrity sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA== -proxy-addr@~2.0.7: +process-warning@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-3.0.0.tgz#96e5b88884187a1dce6f5c3166d611132058710b" + integrity sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ== + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== + +proxy-addr@^2.0.7, proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== @@ -2764,14 +3388,6 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - punycode@^2.1.0: version "2.3.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" @@ -2789,6 +3405,11 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== +quick-format-unescaped@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7" + integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg== + quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" @@ -2799,26 +3420,16 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== dependencies: bytes "3.1.2" http-errors "2.0.0" iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-pkg-up@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670" @@ -2838,7 +3449,7 @@ read-pkg@^6.0.0: parse-json "^5.2.0" type-fest "^1.0.1" -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -2847,6 +3458,17 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^4.0.0: + version "4.5.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09" + integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g== + dependencies: + abort-controller "^3.0.0" + buffer "^6.0.3" + events "^3.3.0" + process "^0.11.10" + string_decoder "^1.3.0" + readable-web-to-node-stream@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" @@ -2854,6 +3476,11 @@ readable-web-to-node-stream@^3.0.2: dependencies: readable-stream "^3.6.0" +real-require@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78" + integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg== + redent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9" @@ -2876,6 +3503,11 @@ regexp.prototype.flags@^1.5.1: define-properties "^1.2.0" set-function-name "^2.0.0" +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -2895,11 +3527,21 @@ resolve@^1.22.4: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +ret@~0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.2.2.tgz#b6861782a1f4762dce43402a71eb7a283f44573c" + integrity sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== +rfdc@^1.2.0, rfdc@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" + integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== + rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -2924,7 +3566,7 @@ safe-array-concat@^1.0.1: has-symbols "^1.0.3" isarray "^2.0.5" -safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -2938,11 +3580,28 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.2.2" is-regex "^1.1.4" +safe-regex2@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/safe-regex2/-/safe-regex2-2.0.0.tgz#b287524c397c7a2994470367e0185e1916b1f5b9" + integrity sha512-PaUSFsUaNNuKwkBijoAPHAK6/eM6VirvyPWlZ7BAQy4D+hCvh4B6lIG+nPdhbFfIbP+gTGBcrdsOaUs0F+ZBOQ== + dependencies: + ret "~0.2.0" + +safe-stable-stringify@^2.3.1: + version "2.4.3" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" + integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== + "safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +secure-json-parse@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862" + integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== + seedrandom@^3.0.5: version "3.0.5" resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" @@ -2953,13 +3612,20 @@ semver@^6.0.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: +semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" +semver@^7.5.4: + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== + dependencies: + lru-cache "^6.0.0" + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -2994,44 +3660,66 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-function-length@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1" - integrity sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w== +set-cookie-parser@^2.4.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51" + integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ== + +set-function-length@^1.1.1, set-function-length@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" + integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== dependencies: - define-data-property "^1.1.1" + define-data-property "^1.1.2" + es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.2" + get-intrinsic "^1.2.3" gopd "^1.0.1" has-property-descriptors "^1.0.1" set-function-name@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" - integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== dependencies: - define-data-property "^1.0.1" + define-data-property "^1.1.4" + es-errors "^1.3.0" functions-have-names "^1.2.3" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.2" setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== -sharp@^0.31.3: - version "0.31.3" - resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.31.3.tgz#60227edc5c2be90e7378a210466c99aefcf32688" - integrity sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg== +sharp@^0.33.2: + version "0.33.2" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.2.tgz#fcd52f2c70effa8a02160b1bfd989a3de55f2dfb" + integrity sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ== dependencies: color "^4.2.3" - detect-libc "^2.0.1" - node-addon-api "^5.0.0" - prebuild-install "^7.1.1" - semver "^7.3.8" - simple-get "^4.0.1" - tar-fs "^2.1.1" - tunnel-agent "^0.6.0" + detect-libc "^2.0.2" + semver "^7.5.4" + optionalDependencies: + "@img/sharp-darwin-arm64" "0.33.2" + "@img/sharp-darwin-x64" "0.33.2" + "@img/sharp-libvips-darwin-arm64" "1.0.1" + "@img/sharp-libvips-darwin-x64" "1.0.1" + "@img/sharp-libvips-linux-arm" "1.0.1" + "@img/sharp-libvips-linux-arm64" "1.0.1" + "@img/sharp-libvips-linux-s390x" "1.0.1" + "@img/sharp-libvips-linux-x64" "1.0.1" + "@img/sharp-libvips-linuxmusl-arm64" "1.0.1" + "@img/sharp-libvips-linuxmusl-x64" "1.0.1" + "@img/sharp-linux-arm" "0.33.2" + "@img/sharp-linux-arm64" "0.33.2" + "@img/sharp-linux-s390x" "0.33.2" + "@img/sharp-linux-x64" "0.33.2" + "@img/sharp-linuxmusl-arm64" "0.33.2" + "@img/sharp-linuxmusl-x64" "0.33.2" + "@img/sharp-wasm32" "0.33.2" + "@img/sharp-win32-ia32" "0.33.2" + "@img/sharp-win32-x64" "0.33.2" shebang-command@^2.0.0: version "2.0.0" @@ -3046,13 +3734,14 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" signal-exit@^3.0.0: version "3.0.7" @@ -3073,15 +3762,6 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" -simple-get@^4.0.0, simple-get@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" - integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== - dependencies: - decompress-response "^6.0.0" - once "^1.3.1" - simple-concat "^1.0.0" - simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -3099,6 +3779,13 @@ slash@^4.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== +sonic-boom@^3.7.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.8.0.tgz#e442c5c23165df897d77c3c14ef3ca40dec66a66" + integrity sha512-ybz6OYOUjoQQCQ/i4LU8kaToD8ACtYP+Cj5qd2AO36bwbdewxWJ3ArmJ2cr6AvxlL2o0PqnCcPGUgkILbfkaCA== + dependencies: + atomic-sleep "^1.0.0" + spdx-correct@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" @@ -3125,11 +3812,16 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== -split2@^4.1.0: +split2@^4.0.0, split2@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== + statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -3171,7 +3863,7 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -string_decoder@^1.1.1: +string_decoder@^1.1.1, string_decoder@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== @@ -3202,11 +3894,6 @@ strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - strtok3@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.0.0.tgz#868c428b4ade64a8fd8fee7364256001c1a4cbe5" @@ -3239,27 +3926,6 @@ tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar-fs@^2.0.0, tar-fs@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - tar@^6.1.11: version "6.2.0" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" @@ -3272,11 +3938,23 @@ tar@^6.1.11: mkdirp "^1.0.3" yallist "^4.0.0" +text-hex@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +thread-stream@^2.0.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.4.1.tgz#6d588b14f0546e59d3f306614f044bc01ce43351" + integrity sha512-d/Ex2iWd1whipbT681JmTINKw0ZwOUBZm7+Gjs64DHuX34mmw8vJL2bFAaNacaW72zYiTJxSHi5abUuOi5nsfg== + dependencies: + real-require "^0.2.0" + tiny-emitter@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" @@ -3289,6 +3967,11 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +toad-cache@^3.3.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/toad-cache/-/toad-cache-3.7.0.tgz#b9b63304ea7c45ec34d91f1d2fa513517025c441" + integrity sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw== + toidentifier@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" @@ -3312,6 +3995,16 @@ trim-newlines@^4.0.2: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125" integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ== +triple-beam@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" + integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== + +ts-api-utils@^1.0.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.2.1.tgz#f716c7e027494629485b21c0df6180f4d08f5e8b" + integrity sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA== + tsconfig-paths@^3.15.0: version "3.15.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" @@ -3332,6 +4025,11 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.4.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -3339,13 +4037,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== - dependencies: - safe-buffer "^5.0.1" - tweetnacl@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" @@ -3420,10 +4111,10 @@ typed-function@^4.1.1: resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-4.1.1.tgz#38ce3cae31f4f513bcb263563fdad27b2afa73e8" integrity sha512-Pq1DVubcvibmm8bYcMowjVnnMwPVMeh0DIdA8ad8NZY2sJgapANJmiigSUwlt+EgXxpfIv8MWrQXTIzkfYZLYQ== -typescript@^4.7.2: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.4.0: + version "5.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" + integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ== unbox-primitive@^1.0.2: version "1.0.2" @@ -3542,6 +4233,32 @@ wide-align@^1.1.2: dependencies: string-width "^1.0.2 || 2 || 3 || 4" +winston-transport@^4.5.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0" + integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg== + dependencies: + logform "^2.3.2" + readable-stream "^3.6.0" + triple-beam "^1.3.0" + +winston@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" + integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== + dependencies: + "@colors/colors" "^1.6.0" + "@dabh/diagnostics" "^2.0.2" + async "^3.2.3" + is-stream "^2.0.0" + logform "^2.4.0" + one-time "^1.0.0" + readable-stream "^3.4.0" + safe-stable-stringify "^2.3.1" + stack-trace "0.0.x" + triple-beam "^1.3.0" + winston-transport "^4.5.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" From f101861719dbab97a217140a3ca5886eaaa6d137 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Mon, 16 Sep 2024 20:53:01 +0200 Subject: [PATCH 02/24] Update eslint flat config Fixed some new linting issues --- api/.eslintrc.json => .eslintrc.json.disabled | 0 .vscode/settings.json | 1 + api/api.ts | 3 +- api/eslint.config.mjs | 141 ++ api/package.json | 26 +- api/routes/ProgressbarRoute.ts | 7 +- api/routes/sharp/managers/TextManager.ts | 6 +- api/routes/sharp/replaceColor.ts | 1 + api/routes/sharp/v1/SharpRoute.ts | 8 +- api/routes/sharp/v1/managers/ImageEditor.ts | 22 +- api/routes/sharp/v1/managers/ImageFetcher.ts | 9 +- api/routes/sharp/v1/managers/ImageManager.ts | 8 +- api/routes/sharp/v1/managers/TextManager.ts | 3 +- api/routes/sharp/v1/mapBody/index.ts | 13 +- api/routes/sharp/v2/Context.ts | 11 +- api/routes/sharp/v2/Image.ts | 3 +- api/routes/sharp/v2/Operation.ts | 7 +- api/routes/sharp/v2/OperationHandler.ts | 8 +- api/routes/sharp/v2/SharpRoute.ts | 6 +- api/routes/sharp/v2/services/ImageEditor.ts | 7 +- api/routes/sharp/v2/services/ImageFetcher.ts | 3 +- api/routes/sharp/v2/services/ImageManager.ts | 3 +- api/routes/sharp/v2/services/TextManager.ts | 3 +- api/types/ImageTypes.ts | 3 +- api/types/PayloadTypes.ts | 6 +- api/{ => types}/definitions/global.d.ts | 8 +- api/utils/Timer.ts | 4 +- api/utils/logging/WinstonLogger.ts | 4 +- api/utils/mapping/mapTypeof.ts | 1 - api/yarn.lock | 2049 ++++++++--------- 30 files changed, 1146 insertions(+), 1228 deletions(-) rename api/.eslintrc.json => .eslintrc.json.disabled (100%) create mode 100644 api/eslint.config.mjs rename api/{ => types}/definitions/global.d.ts (91%) diff --git a/api/.eslintrc.json b/.eslintrc.json.disabled similarity index 100% rename from api/.eslintrc.json rename to .eslintrc.json.disabled diff --git a/.vscode/settings.json b/.vscode/settings.json index d193d49..9120064 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,6 +10,7 @@ "editor.codeActionsOnSave": { "source.fixAll.eslint": "explicit" }, + "eslint.useFlatConfig": true, "editor.defaultFormatter": "vscode.typescript-language-features", "npm.packageManager": "yarn", "files.eol": "\n", diff --git a/api/api.ts b/api/api.ts index 1fd391f..dcd00b1 100644 --- a/api/api.ts +++ b/api/api.ts @@ -1,4 +1,5 @@ -import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; +import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; + import http from 'http'; import ProgressBarRoute from './routes/ProgressbarRoute.js'; diff --git a/api/eslint.config.mjs b/api/eslint.config.mjs new file mode 100644 index 0000000..8019988 --- /dev/null +++ b/api/eslint.config.mjs @@ -0,0 +1,141 @@ +//import eslint from '@eslint/js'; +import tseslint from 'typescript-eslint'; +import tseslintPlugin from '@typescript-eslint/eslint-plugin'; +import tsParser from '@typescript-eslint/parser'; +import stylistic from '@stylistic/eslint-plugin'; +import stylisticTs from '@stylistic/eslint-plugin-ts'; +import importPluginX from 'eslint-plugin-import-x'; + +export default tseslint.config( + { + files: ['**/*.ts', '**/*.tsx', 'eslint.config.mjs'], + ignores: ['**/*.js', '**/*.jsx', 'node_modules'], + plugins: { + '@typescript-eslint': tseslintPlugin, + '@stylistic': stylistic, + '@stylistic/ts': stylisticTs, + 'import-x': importPluginX + }, + languageOptions: { + parser: tsParser, + parserOptions: { + project: './tsconfig.json', + tsconfigRootDir: import.meta.dirname + } + }, + rules: { + ...tseslint.configs.recommended.rules, + ...tseslint.configs['strictTypeChecked'].rules, + ...tseslint.configs['stylisticTypeChecked'].rules, + '@stylistic/no-mixed-spaces-and-tabs': 2, + '@stylistic/lines-between-class-members': ['error', 'always', { + exceptAfterSingleLine: true, + exceptAfterOverload: true + }], + + '@stylistic/object-curly-spacing': ['error', 'always'], + '@stylistic/operator-linebreak': ['error', 'after'], + '@stylistic/no-multi-spaces': ['error'], + '@stylistic/space-infix-ops': 'error', + '@stylistic/arrow-spacing': 'error', + '@stylistic/block-spacing': 'error', + '@stylistic/arrow-parens': ['error', 'always'], + // Sort imports and sort them into groups + 'import-x/order': + [ + 'error', + { + 'newlines-between': 'always', + 'distinctGroup': true, + 'groups': + [ + 'external', + 'builtin', + 'internal', + 'sibling', + 'parent', + 'index' + ] + } + ], + 'import-x/newline-after-import': 'warn', + 'sort-imports': ['error', { + 'ignoreCase': true, + 'ignoreDeclarationSort': true + }], + + '@stylistic/brace-style': ['warn', '1tbs', { + allowSingleLine: true + }], + + '@stylistic/comma-dangle': 'warn', + '@stylistic/comma-spacing': 'error', + '@stylistic/eol-last': ['warn', 'always'], + eqeqeq: 'error', + 'guard-for-in': 'warn', + '@stylistic/indent': ['error', 4, { + SwitchCase: 1 + }], + + '@stylistic/max-statements-per-line': ['error', { + max: 1 + }], + '@stylistic/space-in-parens': 'error', + '@stylistic/comma-spacing': 'error', + + 'no-alert': 'error', + 'no-console': 'error', + 'no-else-return': 'error', + 'no-global-assign': 'error', + 'no-iterator': 'error', + 'no-lone-blocks': 'warn', + 'no-lonely-if': 'error', + + '@stylistic/no-multiple-empty-lines': ['warn', { + max: 1, + maxEOF: 0, + maxBOF: 0 + }], + + 'no-new-func': 'error', + 'no-proto': 'error', + 'no-sequences': 'error', + '@stylistic/no-trailing-spaces': 'warn', + //'no-unused-vars': 'off', + 'no-var': 'error', + 'one-var': ['error', 'never'], + '@stylistic/one-var-declaration-per-line': ['error', 'always'], + + '@stylistic/quotes': ['error', 'single', { + avoidEscape: false + }], + + '@stylistic/semi': [2, 'always'], + + //Typescript + '@typescript-eslint/explicit-member-accessibility': 'error', + '@typescript-eslint/class-literal-property-style': 'error', + '@typescript-eslint/return-await': 'error', + + '@typescript-eslint/explicit-function-return-type': ['error', { + allowExpressions: true + }], + + '@typescript-eslint/strict-boolean-expressions': ['error', { + allowString: false, + allowNumber: false, + allowNullableObject: false, + allowNullableBoolean: false, + allowNullableString: false, + allowNullableNumber: false, + allowAny: false, + allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing: true + }], + '@typescript-eslint/no-unused-vars': ['warn', { + argsIgnorePattern: '^_', + varsIgnorePattern: '^_', + caughtErrorsIgnorePattern: '^_' + }] + } + } +); diff --git a/api/package.json b/api/package.json index 399b6f4..09f4921 100644 --- a/api/package.json +++ b/api/package.json @@ -15,8 +15,9 @@ "build": "tsc", "watch": "tsc --watch", "rebuild": "yarn run clean && yarn run build", - "lint": "eslint --ext .ts ./", - "lint:fix": "eslint --ext .ts --fix ./" + "lint": "eslint .", + "lint:fix": "yarn run lint --fix", + "lint:inspect": "yarn dlx @eslint/config-inspector@latest" }, "dependencies": { "@prisma/client": "^5.10.2", @@ -43,7 +44,7 @@ "node-worker-threads-pool": "^1.5.1", "pb-text-format-to-json": "^1.1.1", "pg": "^8.8.0", - "sharp": "^0.33.2", + "sharp": "^0.33.4", "uuid": "^9.0.0", "uuid-by-string": "^4.0.0", "winston": "^3.11.0" @@ -59,7 +60,9 @@ }, "homepage": "https://github.com/RagingLink/nicelink-api#readme", "devDependencies": { - "@stylistic/eslint-plugin": "^1.6.3", + "@eslint/config-inspector": "^0.5.4", + "@stylistic/eslint-plugin": "^2.8.0", + "@stylistic/eslint-plugin-ts": "^2.8.0", "@types/bent": "^7.3.2", "@types/chalk": "^2.2.0", "@types/color": "^3.0.3", @@ -76,17 +79,14 @@ "@types/pg": "^8.6.5", "@types/uuid": "^9.0.8", "@types/ws": "^8.5.4", - "@typescript-eslint/eslint-plugin": "^7.1.0", - "@typescript-eslint/parser": "^7.1.0", + "@typescript-eslint/eslint-plugin": "^8.6.0", + "@typescript-eslint/parser": "^8.6.0", "del-cli": "^5.0.0", - "eslint": "^8.1.0", - "eslint-import-resolver-typescript": "^3.5.2", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-require-extensions": "^0.1.3", - "eslint-plugin-simple-import-sort": "^12.0.0", - "eslint-plugin-sort": "^2.11.0", + "eslint": "^9.0.0", + "eslint-plugin-import-x": "^4.2.1", "prisma": "^5.10.2", - "typescript": "^5.4.0" + "typescript": "^5.4.0", + "typescript-eslint": "^8.6.0" }, "type": "module" } diff --git a/api/routes/ProgressbarRoute.ts b/api/routes/ProgressbarRoute.ts index f07c735..de58097 100644 --- a/api/routes/ProgressbarRoute.ts +++ b/api/routes/ProgressbarRoute.ts @@ -1,8 +1,9 @@ import Color from 'color'; import { Request, Response, Router } from 'express'; +import sharp from 'sharp'; + import fs from 'fs'; import path from 'path'; -import sharp from 'sharp'; import * as url from 'url'; import CacheManager from '../utils/CacheManager.js'; @@ -20,7 +21,7 @@ export default class ProgressBarRoute { this.router.get('/', (req, res) => void this.getProgressbar(req, res)); this.cache.registerMultipleSweepHandler((items) => { - if (items.length === 0 ) + if (items.length === 0) return; this.logger.log.info('ProgressbarRoute', `Deleted ${items.length} cached bars`); }); @@ -66,7 +67,7 @@ export default class ProgressBarRoute { }).composite([{ input: this.pillShape, blend: 'dest-in' }]).png().toBuffer().then((data) => { void sharp(data).extract({ top: 0, left: 0, height: 60, width: Math.round(996 / 100 * percentage) }).png().toBuffer().then((pillBuffer) => { void sharp(this.pillBg).composite([{ input: pillBuffer, top: 2, left: 2 }]).toBuffer().then((buffer) => { - this.cache.set( colour + percentage.toString(), { buffer }); + this.cache.set(colour + percentage.toString(), { buffer }); res.set('Content-Type', 'image/png'); res.send(buffer); }); diff --git a/api/routes/sharp/managers/TextManager.ts b/api/routes/sharp/managers/TextManager.ts index 4db3047..d002475 100644 --- a/api/routes/sharp/managers/TextManager.ts +++ b/api/routes/sharp/managers/TextManager.ts @@ -1,13 +1,15 @@ import can, { Canvas, CanvasRenderingContext2D, TextMetrics } from 'canvas'; import chalk from 'chalk'; -import fs from 'fs'; import { parse } from 'pb-text-format-to-json'; + +import fs from 'fs'; import { fileURLToPath } from 'url'; +import Timer from './Timer.js'; + import { DefaultOptions, InputOptions } from '../../../types/PayloadTypes.js'; import { isErrnoException } from '../../../utils/index.js'; import { NiceLogger } from '../../../utils/logging/NiceLogger.js'; -import Timer from './Timer.js'; interface Font { name: string; diff --git a/api/routes/sharp/replaceColor.ts b/api/routes/sharp/replaceColor.ts index b6e192c..e6ed1e8 100644 --- a/api/routes/sharp/replaceColor.ts +++ b/api/routes/sharp/replaceColor.ts @@ -1,6 +1,7 @@ import Color from 'color'; import { StaticPool } from 'node-worker-threads-pool'; import sharp from 'sharp'; + import { fileURLToPath } from 'url'; import Image from './v1/managers/Image.js'; diff --git a/api/routes/sharp/v1/SharpRoute.ts b/api/routes/sharp/v1/SharpRoute.ts index 7b19994..7054c39 100644 --- a/api/routes/sharp/v1/SharpRoute.ts +++ b/api/routes/sharp/v1/SharpRoute.ts @@ -1,13 +1,14 @@ import chalk from 'chalk'; import { Request, Response, Router } from 'express'; +import { ImageEditor } from './managers/ImageEditor.js'; +import { ImageManager } from './managers/ImageManager.js'; +import TextManager from './managers/TextManager.js'; + import config from '../../../config.json'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from '../../../utils/Timer.js'; import { SharpDiscord } from '../SharpDiscord.js'; -import { ImageEditor } from './managers/ImageEditor.js'; -import { ImageManager } from './managers/ImageManager.js'; -import TextManager from './managers/TextManager.js'; export default class SharpRoute { private readonly textManager: TextManager; @@ -77,6 +78,7 @@ export default class SharpRoute { }); } catch (e: unknown) { res.send('An error occurred!'); + this.logger.log.error(e); } } diff --git a/api/routes/sharp/v1/managers/ImageEditor.ts b/api/routes/sharp/v1/managers/ImageEditor.ts index e9a0467..84f51bb 100644 --- a/api/routes/sharp/v1/managers/ImageEditor.ts +++ b/api/routes/sharp/v1/managers/ImageEditor.ts @@ -3,14 +3,15 @@ import chalk from 'chalk'; import sharp, { Blend, OverlayOptions } from 'sharp'; import getUuidByString from 'uuid-by-string'; +import Image from './Image.js'; +import { ImageFetcher } from './ImageFetcher.js'; +import TextManager from './TextManager.js'; + import { AlignmentModes, ChildBody, InputBody, MetaBody, OutputBody, TextBody } from '../../../../types/index.js'; import CacheManager from '../../../../utils/CacheManager.js'; -import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; import mapBody from '../mapBody/index.js'; -import Image from './Image.js'; -import { ImageFetcher } from './ImageFetcher.js'; -import TextManager from './TextManager.js'; interface SizeObject { width: number; @@ -28,7 +29,7 @@ export class ImageEditor { meta?: MetaBody; }>; - public constructor(public readonly logger: NiceLogger, public readonly textManager: TextManager) { + public constructor(public readonly logger: DefaultLogger, public readonly textManager: TextManager) { this.imageFetcher = new ImageFetcher(logger, 100000); //? Refresh every half hour and keep edited images cached for 6 hours this.cache = new CacheManager({ hours: 6, refresh: 0.5 }); @@ -52,7 +53,7 @@ export class ImageEditor { try { await this.editImage(fetchedImage, body, meta, timer); } catch (e: unknown) { - this.logger.log('error', 'Editor', e); + this.logger.log.error('Editor', e); meta.errors.push('Unexpected error during image editing'); fetchedImage.sharp = sharp(this.imageFetcher.defaultImageBuffer); } @@ -71,6 +72,7 @@ export class ImageEditor { return new Image(buffer, this.cache.get(this.getBodyStr(inputBody)) !== undefined); } catch (e: unknown) { meta.errors.push('Invalid background image'); + this.logger.log.error(e); return new Image(this.imageFetcher.defaultImageBuffer); } } @@ -129,7 +131,7 @@ export class ImageEditor { } image.sharp = sharp(await image.sharp.toBuffer()); if (operationTimer.elapsedMS > 500 && property !== 'images') - this.logger.log('image', 'EditOperation', chalk.white(property), operationTimer.elapsedBlueStr); + this.logger.log.image('EditOperation', chalk.white(property), operationTimer.elapsedBlueStr); } if (compositeOptions.length > 0) { this.compositeImages(image, compositeOptions); @@ -137,7 +139,7 @@ export class ImageEditor { if (image.edited) { void image.sharp.toBuffer().then((buffer) => { if (timer !== undefined) - this.logger.log('image', 'Editor', 'Generated image', timer.elapsedBlueStr); + this.logger.log.image('Editor', 'Generated image', timer.elapsedBlueStr); this.cache.set(this.getBodyStr(body), { buffer, inputBody: body, @@ -146,7 +148,7 @@ export class ImageEditor { }); } else { if (timer !== undefined) - this.logger.log('image', 'Editor', 'Generated image', timer.elapsedBlueStr); + this.logger.log.image('Editor', 'Generated image', timer.elapsedBlueStr); this.cache.set(this.getBodyStr(body), { buffer: image.buffer, inputBody: body, @@ -248,7 +250,7 @@ export class ImageEditor { if (!childImage.preEdited) await this.editImage(childImage, childObject, meta.children[meta.children.length - 1]); } catch (e: unknown) { - this.logger.log('error', 'Editor', e); + this.logger.log.error('Editor', e); meta.errors.push('Unexpected error during image generation'); childImage.sharp = sharp(this.imageFetcher.defaultImageBuffer); } diff --git a/api/routes/sharp/v1/managers/ImageFetcher.ts b/api/routes/sharp/v1/managers/ImageFetcher.ts index 1b76d0d..0ee3e63 100644 --- a/api/routes/sharp/v1/managers/ImageFetcher.ts +++ b/api/routes/sharp/v1/managers/ImageFetcher.ts @@ -1,10 +1,11 @@ -import fs from 'fs'; import fetch from 'node-fetch'; + +import fs from 'fs'; import path from 'path'; import * as url from 'url'; import CacheManager from '../../../../utils/CacheManager.js'; -import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; const assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', 'assets', 'img'); const transparentImagePath = path.join(assetsPath, 'transparent.png'); @@ -19,7 +20,7 @@ export class ImageFetcher { private readonly _circleImageBuffer = fs.readFileSync(circleImagePath); private readonly _blackImageBuffer = fs.readFileSync(blackImagePath); - public constructor(public readonly logger: NiceLogger, retention = 3600) { + public constructor(public readonly logger: DefaultLogger, retention = 3600) { this.retention = retention; this.cache = new CacheManager({}); } @@ -46,7 +47,7 @@ export class ImageFetcher { try { const arrayBuffer = await (await fetch(src)).arrayBuffer(); return Buffer.from(arrayBuffer); - } catch (e: unknown) { + } catch (_: unknown) { throw Error('Invalid image'); } } diff --git a/api/routes/sharp/v1/managers/ImageManager.ts b/api/routes/sharp/v1/managers/ImageManager.ts index 837e47b..a387fda 100644 --- a/api/routes/sharp/v1/managers/ImageManager.ts +++ b/api/routes/sharp/v1/managers/ImageManager.ts @@ -1,17 +1,19 @@ import { PrismaClient } from '@prisma/client'; import { fileTypeFromBuffer } from 'file-type'; +import { v4 as uuidv4 } from 'uuid'; + import fs from 'fs'; import path from 'path'; import { fileURLToPath } from 'url'; -import { v4 as uuidv4 } from 'uuid'; + +import Image from './Image.js'; +import { ImageEditor } from './ImageEditor.js'; import { InputBody } from '../../../../types/PayloadTypes.js'; import CacheManager from '../../../../utils/CacheManager.js'; import { guard } from '../../../../utils/guard/index.js'; import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; import Prisma from '../../Prisma.js'; -import Image from './Image.js'; -import { ImageEditor } from './ImageEditor.js'; export class ImageManager { private readonly cache: CacheManager<{ buffer: Buffer; }>; diff --git a/api/routes/sharp/v1/managers/TextManager.ts b/api/routes/sharp/v1/managers/TextManager.ts index f1d57e8..0fc9721 100644 --- a/api/routes/sharp/v1/managers/TextManager.ts +++ b/api/routes/sharp/v1/managers/TextManager.ts @@ -1,7 +1,8 @@ import can, { Canvas, CanvasRenderingContext2D } from 'canvas'; import chalk from 'chalk'; -import fs from 'fs'; import { parse } from 'pb-text-format-to-json'; + +import fs from 'fs'; import { fileURLToPath } from 'url'; import { DefaultOptions, InputOptions } from '../../../../types/PayloadTypes.js'; diff --git a/api/routes/sharp/v1/mapBody/index.ts b/api/routes/sharp/v1/mapBody/index.ts index dd38fe0..d55d01e 100644 --- a/api/routes/sharp/v1/mapBody/index.ts +++ b/api/routes/sharp/v1/mapBody/index.ts @@ -1,6 +1,7 @@ +import * as propertyMapping from './bodyMappings.js'; + import { ChildBody, CropOption, InputBody, MetaBody, ResizeOption, TextBody } from '../../../../types/index.js'; import { guard } from '../../../../utils/guard/index.js'; -import * as propertyMapping from './bodyMappings.js'; const propertyAliases = { bg: 'background', @@ -65,7 +66,7 @@ export default function mapBody(inputBody: JObject, meta: MetaBody, isChild = fa meta.errors.push(`"${key}" doesn't have the right type`); continue; } - } catch (e: unknown) { + } catch (_: unknown) { meta.errors.push(`"${key}" doesn't have the right type`); continue; } @@ -106,7 +107,7 @@ function mapTextBody(textArray: JObject | JArray, meta: MetaBody): TextBody[] { meta.errors.push(`"${key}" doesn't have the right type`); continue; } - } catch (e: unknown) { + } catch (_: unknown) { meta.errors.push(`"${key}" doesn't have the right type`); continue; } @@ -132,7 +133,7 @@ function mapCropBody(cropOption: JToken, meta: MetaBody): CropOption | undefined meta.warnings.push('"crop" was converted to number'); mappedCropOption = cropOption; } - } catch (e: unknown) { + } catch (_: unknown) { meta.errors.push('"crop" doesn\'t have the right type'); } } else if (typeof cropOption === 'object' && !Array.isArray(cropOption) && cropOption !== null) { @@ -154,7 +155,7 @@ function mapCropBody(cropOption: JToken, meta: MetaBody): CropOption | undefined meta.errors.push(`"${key}" doesn't have the right type`); continue; } - } catch (e: unknown) { + } catch (_: unknown) { meta.errors.push(`"${key}" doesn't have the right type`); continue; } @@ -205,7 +206,7 @@ function mapResizeBody(resizeOption: JToken, meta: MetaBody): ResizeOption | und meta.errors.push(`"${key}" doesn't have the right type`); continue; } - } catch (e: unknown) { + } catch (_: unknown) { meta.errors.push(`"${key}" doesn't have the right type`); continue; } diff --git a/api/routes/sharp/v2/Context.ts b/api/routes/sharp/v2/Context.ts index a95a423..c7d80b3 100644 --- a/api/routes/sharp/v2/Context.ts +++ b/api/routes/sharp/v2/Context.ts @@ -1,19 +1,20 @@ -import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Image from './Image.js'; import { GenericOperation, UnknownOperation } from './Operation.js'; +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; + export type CompletedOperation = SuccessOperation | ErrorOperation | WarningOperation; export type SuccessOperation = GenericOperation & { duration?: number; buffer: Buffer; -} +}; export type ErrorOperation = Omit & { error: string; -} +}; export type WarningOperation = SuccessOperation & { warning: string; -} +}; interface ContextObject { ops: Omit[]; @@ -69,7 +70,7 @@ export default class Context { }; } - public getAppliedOperations(): (SuccessOperation )[] { + public getAppliedOperations(): (SuccessOperation)[] { return this.operations.filter((e): e is SuccessOperation => !('error' in e)); } } diff --git a/api/routes/sharp/v2/Image.ts b/api/routes/sharp/v2/Image.ts index 26435d3..609dbe6 100644 --- a/api/routes/sharp/v2/Image.ts +++ b/api/routes/sharp/v2/Image.ts @@ -2,9 +2,10 @@ import sizeOf from 'buffer-image-size'; import sharp, { Sharp } from 'sharp'; import { v4 as uuidv4 } from 'uuid'; -import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Context from './Context.js'; +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; + export default class Image { public readonly context: Context; public readonly id: string; diff --git a/api/routes/sharp/v2/Operation.ts b/api/routes/sharp/v2/Operation.ts index 3b19548..e4a9c8e 100644 --- a/api/routes/sharp/v2/Operation.ts +++ b/api/routes/sharp/v2/Operation.ts @@ -1,13 +1,14 @@ import chalk from 'chalk'; +import Context from './Context.js'; +import Image from './Image.js'; + import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import { mapping } from '../../../utils/mapping/index.js'; import Timer from '../../../utils/Timer.js'; import { TypeMappingResult } from '../../../utils/types.js'; -import Context from './Context.js'; -import Image from './Image.js'; -type DataMap = (value: unknown) => TypeMappingResult +type DataMap = (value: unknown) => TypeMappingResult; export type IGeneralOperation = new (logger: DefaultLogger) => IOperation; diff --git a/api/routes/sharp/v2/OperationHandler.ts b/api/routes/sharp/v2/OperationHandler.ts index 71d7c24..47fbb19 100644 --- a/api/routes/sharp/v2/OperationHandler.ts +++ b/api/routes/sharp/v2/OperationHandler.ts @@ -1,16 +1,18 @@ import chalk from 'chalk'; -import fs from 'fs'; import _ from 'lodash'; + +import fs from 'fs'; import { fileURLToPath } from 'url'; -import { guard } from '../../../utils/guard/index.js'; -import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Context, { SuccessOperation } from './Context.js'; import Image from './Image.js'; import Operation, { IGeneralOperation, IOperation } from './Operation.js'; import { CachedOperation } from './services/ImageEditor.js'; import { ValidInputObject } from './validateInput.js'; +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import { guard } from '../../../utils/guard/index.js'; + interface ExportObj { default: unknown; } diff --git a/api/routes/sharp/v2/SharpRoute.ts b/api/routes/sharp/v2/SharpRoute.ts index 527d16e..7f985db 100644 --- a/api/routes/sharp/v2/SharpRoute.ts +++ b/api/routes/sharp/v2/SharpRoute.ts @@ -1,12 +1,14 @@ import { Router } from 'express'; +import sharp from 'sharp'; + import fs from 'fs'; import path from 'path'; -import sharp from 'sharp'; import url from 'url'; +import ImageManager from './services/ImageManager.js'; + import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from '../../../utils/Timer.js'; -import ImageManager from './services/ImageManager.js'; const testImageBuffer = fs.readFileSync(path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', 'assets', 'img', 'testImage2.png')); diff --git a/api/routes/sharp/v2/services/ImageEditor.ts b/api/routes/sharp/v2/services/ImageEditor.ts index eb2d02c..d9f5520 100644 --- a/api/routes/sharp/v2/services/ImageEditor.ts +++ b/api/routes/sharp/v2/services/ImageEditor.ts @@ -1,16 +1,17 @@ //import _ from 'lodash'; +import ImageFetcher from './ImageFetcher.js'; + import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; import { SuccessOperation } from '../Context.js'; import Image from '../Image.js'; import OperationHandler from '../OperationHandler.js'; import { validateRootInput } from '../validateInput.js'; -import ImageFetcher from './ImageFetcher.js'; -export type CachedOperation = (SuccessOperation ) & { +export type CachedOperation = (SuccessOperation) & { nextOperations?: CachedOperation[]; -} +}; export class ImageEditor { public readonly fetcher: ImageFetcher; diff --git a/api/routes/sharp/v2/services/ImageFetcher.ts b/api/routes/sharp/v2/services/ImageFetcher.ts index a684b0f..53f55fa 100644 --- a/api/routes/sharp/v2/services/ImageFetcher.ts +++ b/api/routes/sharp/v2/services/ImageFetcher.ts @@ -1,5 +1,6 @@ -import fs from 'fs'; import fetch from 'node-fetch'; + +import fs from 'fs'; import path from 'path'; import url from 'url'; diff --git a/api/routes/sharp/v2/services/ImageManager.ts b/api/routes/sharp/v2/services/ImageManager.ts index a9be1c7..0f0ca96 100644 --- a/api/routes/sharp/v2/services/ImageManager.ts +++ b/api/routes/sharp/v2/services/ImageManager.ts @@ -1,6 +1,7 @@ +import { ImageEditor } from './ImageEditor.js'; + import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Image from '../Image.js'; -import { ImageEditor } from './ImageEditor.js'; export default class ImageManager { private readonly editor: ImageEditor; diff --git a/api/routes/sharp/v2/services/TextManager.ts b/api/routes/sharp/v2/services/TextManager.ts index abe88a0..41d2d6e 100644 --- a/api/routes/sharp/v2/services/TextManager.ts +++ b/api/routes/sharp/v2/services/TextManager.ts @@ -1,7 +1,8 @@ import can, { Canvas, CanvasRenderingContext2D, TextMetrics } from 'canvas'; import chalk from 'chalk'; -import fs from 'fs'; import { parse } from 'pb-text-format-to-json'; + +import fs from 'fs'; import { fileURLToPath } from 'url'; import { DefaultOptions, InputOptions } from '../../../../types/PayloadTypes.js'; diff --git a/api/types/ImageTypes.ts b/api/types/ImageTypes.ts index 2d7ec9a..6917521 100644 --- a/api/types/ImageTypes.ts +++ b/api/types/ImageTypes.ts @@ -1,8 +1,9 @@ import sharp from 'sharp'; -import Image from '../routes/sharp/v1/managers/Image.js'; import { InputBody } from './PayloadTypes.js'; +import Image from '../routes/sharp/v1/managers/Image.js'; + export interface MetaBody { children: MetaBody[]; errors: string[]; diff --git a/api/types/PayloadTypes.ts b/api/types/PayloadTypes.ts index 93c755e..d31536c 100644 --- a/api/types/PayloadTypes.ts +++ b/api/types/PayloadTypes.ts @@ -1,4 +1,4 @@ -export type TextOption = TextBody | TextBody[] +export type TextOption = TextBody | TextBody[]; export type AlignmentModes = 'top-left' | 'top-middle' | 'top-right' | 'left' | 'center' | 'right' | 'bot-left' | 'bot-middle' | 'bot-right'; @@ -18,13 +18,13 @@ export interface TextBody extends InputOptions { y?: number; alignment?: AlignmentModes; } -export type CropModes = 'auto' +export type CropModes = 'auto'; export type CropOption = CropModes | number | { width?: number; height?: number; x?: number; y?: number; -} +}; export interface ChildBody extends InputBody { size?: 'contain'; diff --git a/api/definitions/global.d.ts b/api/types/definitions/global.d.ts similarity index 91% rename from api/definitions/global.d.ts rename to api/types/definitions/global.d.ts index e9a2dd3..0ccc19b 100644 --- a/api/definitions/global.d.ts +++ b/api/types/definitions/global.d.ts @@ -1,7 +1,6 @@ import ''; declare global { - // eslint-disable-next-line @typescript-eslint/ban-types type Primitive = string | number | bigint | boolean | object | Function | symbol | undefined; type JToken = { [key: string]: JToken; } | JArray | JValue | null | undefined; type JValue = string | number | boolean; @@ -18,10 +17,9 @@ declare global { 'object': JObject; } - // eslint-disable-next-line @typescript-eslint/ban-types type ClassOf = (Function & { prototype: T; }) | (abstract new (...args: never) => T); type PropertyNamesOfType = { [K in keyof T]: T[K] extends P ? K : never }[keyof T]; - type PropertiesOfType = { [K in PropertyNamesOfType]: T[K] } + type PropertiesOfType = { [K in PropertyNamesOfType]: T[K] }; type Intersect = { [K in (keyof T1 & keyof T2)]: T1[K] extends T2[K] ? T2[K] extends T1[K] ? T1[K] : never : never }; type UppercaseFirst = T extends `${infer L}${infer R}` ? `${Uppercase}${R}` : T; @@ -32,8 +30,7 @@ declare global { type Numeric = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'; type Alphanumeric = Letter | Numeric; - type Mutable = { -readonly [P in keyof T]: T[P] } - // eslint-disable-next-line @typescript-eslint/ban-types + type Mutable = { -readonly [P in keyof T]: T[P] }; type DeepMutable = T extends Exclude ? T : { -readonly [P in keyof T]: DeepMutable; }; type FilteredKeys = { [P in keyof T]: T[P] extends U ? P : never }[keyof T]; @@ -41,7 +38,6 @@ declare global { keys(value: Exclude): (string & keyof T)[]; values(value: Exclude): T[keyof T][]; entries(value: Exclude): [string & keyof T, T[string & keyof T]][]; - // eslint-disable-next-line @typescript-eslint/ban-types create(value: T): T; fromEntries(entries: Iterable): Record; } diff --git a/api/utils/Timer.ts b/api/utils/Timer.ts index 28e414d..28a53a8 100644 --- a/api/utils/Timer.ts +++ b/api/utils/Timer.ts @@ -1,7 +1,7 @@ -import { hrtime } from 'node:process'; - import chalk from 'chalk'; +import { hrtime } from 'node:process'; + export default class Timer { private startTime?: bigint; private stopTime?: bigint; diff --git a/api/utils/logging/WinstonLogger.ts b/api/utils/logging/WinstonLogger.ts index 435bbb6..ec67615 100644 --- a/api/utils/logging/WinstonLogger.ts +++ b/api/utils/logging/WinstonLogger.ts @@ -18,8 +18,8 @@ function createWinstonLogger(options?: Pick { diff --git a/api/utils/mapping/mapTypeof.ts b/api/utils/mapping/mapTypeof.ts index d9880d9..797e212 100644 --- a/api/utils/mapping/mapTypeof.ts +++ b/api/utils/mapping/mapTypeof.ts @@ -17,6 +17,5 @@ export interface TypeofMapping { 'bigint': bigint; 'symbol': symbol; 'object': object; - // eslint-disable-next-line @typescript-eslint/ban-types 'function': Function; } diff --git a/api/yarn.lock b/api/yarn.lock index d06456f..9e0f96c 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@aashutoshrathi/word-wrap@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" - integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== - "@babel/code-frame@^7.0.0": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" @@ -50,13 +45,128 @@ enabled "2.0.x" kuler "^2.0.0" -"@emnapi/runtime@^0.45.0": - version "0.45.0" - resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-0.45.0.tgz#e754de04c683263f34fd0c7f32adfe718bbe4ddd" - integrity sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w== +"@emnapi/runtime@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.2.0.tgz#71d018546c3a91f3b51106530edbc056b9f2f2e3" + integrity sha512-bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ== dependencies: tslib "^2.4.0" +"@esbuild/aix-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" + integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== + +"@esbuild/android-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" + integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== + +"@esbuild/android-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" + integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== + +"@esbuild/android-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" + integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== + +"@esbuild/darwin-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" + integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== + +"@esbuild/darwin-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" + integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== + +"@esbuild/freebsd-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" + integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== + +"@esbuild/freebsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" + integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== + +"@esbuild/linux-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" + integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== + +"@esbuild/linux-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" + integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== + +"@esbuild/linux-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" + integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== + +"@esbuild/linux-loong64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" + integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== + +"@esbuild/linux-mips64el@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" + integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== + +"@esbuild/linux-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" + integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== + +"@esbuild/linux-riscv64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" + integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== + +"@esbuild/linux-s390x@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" + integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== + +"@esbuild/linux-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" + integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== + +"@esbuild/netbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" + integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== + +"@esbuild/openbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" + integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== + +"@esbuild/sunos-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" + integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== + +"@esbuild/win32-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" + integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== + +"@esbuild/win32-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" + integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== + +"@esbuild/win32-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" + integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== + "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -64,30 +174,82 @@ dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" - integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== +"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0": + version "4.11.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.1.tgz#a547badfc719eb3e5f4b556325e542fbe9d7a18f" + integrity sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q== -"@eslint/eslintrc@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" - integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== +"@eslint/config-array@^0.17.1": + version "0.17.1" + resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.17.1.tgz#d9b8b8b6b946f47388f32bedfd3adf29ca8f8910" + integrity sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA== + dependencies: + "@eslint/object-schema" "^2.1.4" + debug "^4.3.1" + minimatch "^3.1.2" + +"@eslint/config-array@^0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d" + integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw== + dependencies: + "@eslint/object-schema" "^2.1.4" + debug "^4.3.1" + minimatch "^3.1.2" + +"@eslint/config-inspector@^0.5.4": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@eslint/config-inspector/-/config-inspector-0.5.4.tgz#403fe1bcadff0d490ca48ff1926f0eb663c1c5de" + integrity sha512-WB/U/B6HdRiIt/CfbcqqFp7Svz+3INLtnGcuMT2hnU39S3cb9JGGkvB1T6lbIlDoQ9VRnhc4riIFFoicGRZ2mw== + dependencies: + "@eslint/config-array" "^0.17.1" + "@voxpelli/config-array-find-files" "^0.1.2" + bundle-require "^5.0.0" + cac "^6.7.14" + chokidar "^3.6.0" + esbuild "^0.21.5" + fast-glob "^3.3.2" + find-up "^7.0.0" + get-port-please "^3.1.2" + h3 "^1.12.0" + minimatch "^9.0.5" + mlly "^1.7.1" + mrmime "^2.0.0" + open "^10.1.0" + picocolors "^1.0.1" + ws "^8.18.0" + +"@eslint/eslintrc@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6" + integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.6.0" - globals "^13.19.0" + espree "^10.0.1" + globals "^14.0.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.57.0": - version "8.57.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" - integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== +"@eslint/js@9.10.0": + version "9.10.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.10.0.tgz#eaa3cb0baec497970bb29e43a153d0d5650143c6" + integrity sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g== + +"@eslint/object-schema@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" + integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== + +"@eslint/plugin-kit@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz#809b95a0227ee79c3195adfb562eb94352e77974" + integrity sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ== + dependencies: + levn "^0.4.1" "@fastify/ajv-compiler@^3.5.0": version "3.5.0" @@ -117,137 +279,128 @@ dependencies: fast-deep-equal "^3.1.3" -"@humanwhocodes/config-array@^0.11.14": - version "0.11.14" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" - integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== - dependencies: - "@humanwhocodes/object-schema" "^2.0.2" - debug "^4.3.1" - minimatch "^3.0.5" - "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" - integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== +"@humanwhocodes/retry@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" + integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== -"@img/sharp-darwin-arm64@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.2.tgz#0a52a82c2169112794dac2c71bfba9e90f7c5bd1" - integrity sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w== +"@img/sharp-darwin-arm64@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz#ef5b5a07862805f1e8145a377c8ba6e98813ca08" + integrity sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ== optionalDependencies: - "@img/sharp-libvips-darwin-arm64" "1.0.1" + "@img/sharp-libvips-darwin-arm64" "1.0.4" -"@img/sharp-darwin-x64@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.2.tgz#982e26bb9d38a81f75915c4032539aed621d1c21" - integrity sha512-/rK/69Rrp9x5kaWBjVN07KixZanRr+W1OiyKdXcbjQD6KbW+obaTeBBtLUAtbBsnlTTmWthw99xqoOS7SsySDg== +"@img/sharp-darwin-x64@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz#e03d3451cd9e664faa72948cc70a403ea4063d61" + integrity sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q== optionalDependencies: - "@img/sharp-libvips-darwin-x64" "1.0.1" + "@img/sharp-libvips-darwin-x64" "1.0.4" -"@img/sharp-libvips-darwin-arm64@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.1.tgz#81e83ffc2c497b3100e2f253766490f8fad479cd" - integrity sha512-kQyrSNd6lmBV7O0BUiyu/OEw9yeNGFbQhbxswS1i6rMDwBBSX+e+rPzu3S+MwAiGU3HdLze3PanQ4Xkfemgzcw== +"@img/sharp-libvips-darwin-arm64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz#447c5026700c01a993c7804eb8af5f6e9868c07f" + integrity sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg== -"@img/sharp-libvips-darwin-x64@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.1.tgz#fc1fcd9d78a178819eefe2c1a1662067a83ab1d6" - integrity sha512-eVU/JYLPVjhhrd8Tk6gosl5pVlvsqiFlt50wotCvdkFGf+mDNBJxMh+bvav+Wt3EBnNZWq8Sp2I7XfSjm8siog== +"@img/sharp-libvips-darwin-x64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz#e0456f8f7c623f9dbfbdc77383caa72281d86062" + integrity sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ== -"@img/sharp-libvips-linux-arm64@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.1.tgz#26eb8c556a9b0db95f343fc444abc3effb67ebcf" - integrity sha512-bnGG+MJjdX70mAQcSLxgeJco11G+MxTz+ebxlz8Y3dxyeb3Nkl7LgLI0mXupoO+u1wRNx/iRj5yHtzA4sde1yA== +"@img/sharp-libvips-linux-arm64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz#979b1c66c9a91f7ff2893556ef267f90ebe51704" + integrity sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA== -"@img/sharp-libvips-linux-arm@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.1.tgz#2a377b959ff7dd6528deee486c25461296a4fa8b" - integrity sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ== +"@img/sharp-libvips-linux-arm@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz#99f922d4e15216ec205dcb6891b721bfd2884197" + integrity sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g== -"@img/sharp-libvips-linux-s390x@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.1.tgz#af28ac9ba929204467ecdf843330d791e9421e10" - integrity sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ== +"@img/sharp-libvips-linux-s390x@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz#f8a5eb1f374a082f72b3f45e2fb25b8118a8a5ce" + integrity sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA== -"@img/sharp-libvips-linux-x64@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.1.tgz#4273d182aa51912e655e1214ea47983d7c1f7f8d" - integrity sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw== +"@img/sharp-libvips-linux-x64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz#d4c4619cdd157774906e15770ee119931c7ef5e0" + integrity sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw== -"@img/sharp-libvips-linuxmusl-arm64@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.1.tgz#d150c92151cea2e8d120ad168b9c358d09c77ce8" - integrity sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg== +"@img/sharp-libvips-linuxmusl-arm64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz#166778da0f48dd2bded1fa3033cee6b588f0d5d5" + integrity sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA== -"@img/sharp-libvips-linuxmusl-x64@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.1.tgz#e297c1a4252c670d93b0f9e51fca40a7a5b6acfd" - integrity sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw== +"@img/sharp-libvips-linuxmusl-x64@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz#93794e4d7720b077fcad3e02982f2f1c246751ff" + integrity sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw== -"@img/sharp-linux-arm64@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.2.tgz#af3409f801a9bee1d11d0c7e971dcd6180f80022" - integrity sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew== +"@img/sharp-linux-arm64@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz#edb0697e7a8279c9fc829a60fc35644c4839bb22" + integrity sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA== optionalDependencies: - "@img/sharp-libvips-linux-arm64" "1.0.1" + "@img/sharp-libvips-linux-arm64" "1.0.4" -"@img/sharp-linux-arm@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.2.tgz#181f7466e6ac074042a38bfb679eb82505e17083" - integrity sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA== +"@img/sharp-linux-arm@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz#422c1a352e7b5832842577dc51602bcd5b6f5eff" + integrity sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ== optionalDependencies: - "@img/sharp-libvips-linux-arm" "1.0.1" + "@img/sharp-libvips-linux-arm" "1.0.5" -"@img/sharp-linux-s390x@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.2.tgz#9c171f49211f96fba84410b3e237b301286fa00f" - integrity sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA== +"@img/sharp-linux-s390x@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz#f5c077926b48e97e4a04d004dfaf175972059667" + integrity sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q== optionalDependencies: - "@img/sharp-libvips-linux-s390x" "1.0.1" + "@img/sharp-libvips-linux-s390x" "1.0.4" -"@img/sharp-linux-x64@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.2.tgz#b956dfc092adc58c2bf0fae2077e6f01a8b2d5d7" - integrity sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A== +"@img/sharp-linux-x64@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz#d806e0afd71ae6775cc87f0da8f2d03a7c2209cb" + integrity sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA== optionalDependencies: - "@img/sharp-libvips-linux-x64" "1.0.1" + "@img/sharp-libvips-linux-x64" "1.0.4" -"@img/sharp-linuxmusl-arm64@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.2.tgz#10e0ec5a79d1234c6a71df44c9f3b0bef0bc0f15" - integrity sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA== +"@img/sharp-linuxmusl-arm64@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz#252975b915894fb315af5deea174651e208d3d6b" + integrity sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g== optionalDependencies: - "@img/sharp-libvips-linuxmusl-arm64" "1.0.1" + "@img/sharp-libvips-linuxmusl-arm64" "1.0.4" -"@img/sharp-linuxmusl-x64@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.2.tgz#29e0030c24aa27c38201b1fc84e3d172899fcbe0" - integrity sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A== +"@img/sharp-linuxmusl-x64@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz#3f4609ac5d8ef8ec7dadee80b560961a60fd4f48" + integrity sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw== optionalDependencies: - "@img/sharp-libvips-linuxmusl-x64" "1.0.1" + "@img/sharp-libvips-linuxmusl-x64" "1.0.4" -"@img/sharp-wasm32@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.2.tgz#38d7c740a22de83a60ad1e6bcfce17462b0d4230" - integrity sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ== +"@img/sharp-wasm32@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz#6f44f3283069d935bb5ca5813153572f3e6f61a1" + integrity sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg== dependencies: - "@emnapi/runtime" "^0.45.0" + "@emnapi/runtime" "^1.2.0" -"@img/sharp-win32-ia32@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.2.tgz#09456314e223f68e5417c283b45c399635c16202" - integrity sha512-okBpql96hIGuZ4lN3+nsAjGeggxKm7hIRu9zyec0lnfB8E7Z6p95BuRZzDDXZOl2e8UmR4RhYt631i7mfmKU8g== +"@img/sharp-win32-ia32@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz#1a0c839a40c5351e9885628c85f2e5dfd02b52a9" + integrity sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ== -"@img/sharp-win32-x64@0.33.2": - version "0.33.2" - resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.2.tgz#148e96dfd6e68747da41a311b9ee4559bb1b1471" - integrity sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg== +"@img/sharp-win32-x64@0.33.5": + version "0.33.5" + resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342" + integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg== "@mapbox/node-pre-gyp@^1.0.0": version "1.0.11" @@ -272,11 +425,24 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" +"@nodelib/fs.scandir@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-3.0.0.tgz#91c0a33e1aeaedcd4bab2bf31be5d1962a55d2a7" + integrity sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg== + dependencies: + "@nodelib/fs.stat" "3.0.0" + run-parallel "^1.2.0" + "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== +"@nodelib/fs.stat@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-3.0.0.tgz#ef6c829f2b05f42595d88854ebd777d4335ff0a9" + integrity sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ== + "@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" @@ -285,6 +451,14 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@nodelib/fs.walk@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-2.0.0.tgz#10499ac2210f6399770b465ba728adafc7d44bb1" + integrity sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A== + dependencies: + "@nodelib/fs.scandir" "3.0.0" + fastq "^1.15.0" + "@prisma/client@^5.10.2": version "5.10.2" resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.10.2.tgz#e087b40a4de8e3171eb9cbf0a873465cd2068e17" @@ -326,54 +500,25 @@ dependencies: "@prisma/debug" "5.10.2" -"@stylistic/eslint-plugin-js@1.6.3", "@stylistic/eslint-plugin-js@^1.6.3": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-1.6.3.tgz#1111d42a81e9f827fdb3f1e09292af0682e37e1d" - integrity sha512-ckdz51oHxD2FaxgY2piJWJVJiwgp8Uu96s+as2yB3RMwavn3nHBrpliVukXY9S/DmMicPRB2+H8nBk23GDG+qA== +"@stylistic/eslint-plugin-ts@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.8.0.tgz#b45029af65ecfa7cc28ff42238d55c0f55f7dbf8" + integrity sha512-VukJqkRlC2psLKoIHJ+4R3ZxLJfWeizGGX+X5ZxunjXo4MbxRNtwu5UvXuerABg4s2RV6Z3LFTdm0WvI4+RAMQ== dependencies: - "@types/eslint" "^8.56.2" - acorn "^8.11.3" - escape-string-regexp "^4.0.0" - eslint-visitor-keys "^3.4.3" - espree "^9.6.1" + "@typescript-eslint/utils" "^8.4.0" + eslint-visitor-keys "^4.0.0" + espree "^10.1.0" -"@stylistic/eslint-plugin-jsx@1.6.3": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-jsx/-/eslint-plugin-jsx-1.6.3.tgz#6560eca8de9ada77d3b4eeb4a6805b49dc4b7c29" - integrity sha512-SRysCIg59Zvn3dJPqHziiHwuni4NNj1et5stAmivmyQ3Cdp2ULCB7tGxCF1OxpkwRlZQue3ZgdiM7EXfJKaf9w== +"@stylistic/eslint-plugin@^2.8.0": + version "2.8.0" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-2.8.0.tgz#9fcbcf8b4b27cc3867eedce37b8c8fded1010107" + integrity sha512-Ufvk7hP+bf+pD35R/QfunF793XlSRIC7USr3/EdgduK9j13i2JjmsM0LUz3/foS+jDYp2fzyWZA9N44CPur0Ow== dependencies: - "@stylistic/eslint-plugin-js" "^1.6.3" - "@types/eslint" "^8.56.2" + "@typescript-eslint/utils" "^8.4.0" + eslint-visitor-keys "^4.0.0" + espree "^10.1.0" estraverse "^5.3.0" - picomatch "^4.0.1" - -"@stylistic/eslint-plugin-plus@1.6.3": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-plus/-/eslint-plugin-plus-1.6.3.tgz#faeb346025e47faf05e016951bb9f4e4c87a016b" - integrity sha512-TuwQOdyVGycDPw5XeF7W4f3ZonAVzOAzORSaD2yGAJ0fRAbJ+l/v3CkKzIAqBBwWkc+c2aRMsWtLP2+viBnmlQ== - dependencies: - "@types/eslint" "^8.56.2" - "@typescript-eslint/utils" "^6.21.0" - -"@stylistic/eslint-plugin-ts@1.6.3": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-1.6.3.tgz#4829ca62446d1005f99e5ce9e7ec8588737cc0d1" - integrity sha512-v5GwZsPLblWM9uAIdaSi31Sed3XBWlTFQJ3b5upEmj6QsKYivA5nmIYutwqqL133QdVWjmC86pINlx2Muq3uNQ== - dependencies: - "@stylistic/eslint-plugin-js" "1.6.3" - "@types/eslint" "^8.56.2" - "@typescript-eslint/utils" "^6.21.0" - -"@stylistic/eslint-plugin@^1.6.3": - version "1.6.3" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-1.6.3.tgz#7d3e8009370d093de0306a116b9a8b15dabe2ff6" - integrity sha512-WDa4FjhImp7YcztRaMG09svhKYYhi2Hc4p9ltQRSqyB4fsUUFm+GKzStqqH7xfjHnxacMJaOnaMGRTUqIIZDLA== - dependencies: - "@stylistic/eslint-plugin-js" "1.6.3" - "@stylistic/eslint-plugin-jsx" "1.6.3" - "@stylistic/eslint-plugin-plus" "1.6.3" - "@stylistic/eslint-plugin-ts" "1.6.3" - "@types/eslint" "^8.56.2" + picomatch "^4.0.2" "@tokenizer/token@^0.3.0": version "0.3.0" @@ -438,19 +583,6 @@ resolved "https://registry.yarnpkg.com/@types/delta-e/-/delta-e-0.0.2.tgz#fa7d1e7d4525b6536fb125334f22343a16277994" integrity sha512-DLvqCZ+ce6qVLp8HIxx8rrLjog1t0NlSLXOzz2FbYC31xHMSADMEz+MrJTvYTeuHez6Wtm0dDYgGtBY+7Dgf4Q== -"@types/eslint@^8.56.2": - version "8.56.5" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.5.tgz#94b88cab77588fcecdd0771a6d576fa1c0af9d02" - integrity sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" - integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== - "@types/express-serve-static-core@^4.17.33": version "4.17.43" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz#10d8444be560cb789c4735aea5eac6e5af45df54" @@ -476,16 +608,6 @@ resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f" integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA== -"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.9": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" - integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== - "@types/lodash@^4.14.199": version "4.14.202" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" @@ -567,16 +689,6 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== -"@types/semver@^7.3.12": - version "7.5.6" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" - integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== - -"@types/semver@^7.5.0": - version "7.5.8" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" - integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== - "@types/send@*": version "0.17.4" resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" @@ -611,199 +723,93 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz#22bb999a8d59893c0ea07923e8a21f9d985ad740" - integrity sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w== - dependencies: - "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "7.1.0" - "@typescript-eslint/type-utils" "7.1.0" - "@typescript-eslint/utils" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" - debug "^4.3.4" +"@typescript-eslint/eslint-plugin@8.6.0", "@typescript-eslint/eslint-plugin@^8.6.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.6.0.tgz#20049754ff9f6d3a09bf240297f029ce04290999" + integrity sha512-UOaz/wFowmoh2G6Mr9gw60B1mm0MzUtm6Ic8G2yM1Le6gyj5Loi/N+O5mocugRGY+8OeeKmkMmbxNqUCq3B4Sg== + dependencies: + "@eslint-community/regexpp" "^4.10.0" + "@typescript-eslint/scope-manager" "8.6.0" + "@typescript-eslint/type-utils" "8.6.0" + "@typescript-eslint/utils" "8.6.0" + "@typescript-eslint/visitor-keys" "8.6.0" graphemer "^1.4.0" - ignore "^5.2.4" + ignore "^5.3.1" natural-compare "^1.4.0" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/experimental-utils@^5.54.1": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz#14559bf73383a308026b427a4a6129bae2146741" - integrity sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw== - dependencies: - "@typescript-eslint/utils" "5.62.0" + ts-api-utils "^1.3.0" -"@typescript-eslint/parser@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.1.0.tgz#b89dab90840f7d2a926bf4c23b519576e8c31970" - integrity sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w== +"@typescript-eslint/parser@8.6.0", "@typescript-eslint/parser@^8.6.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.6.0.tgz#02e092b9dc8b4e319172af620d0d39b337d948f6" + integrity sha512-eQcbCuA2Vmw45iGfcyG4y6rS7BhWfz9MQuk409WD47qMM+bKCGQWXxvoOs1DUp+T7UBMTtRTVT+kXr7Sh4O9Ow== dependencies: - "@typescript-eslint/scope-manager" "7.1.0" - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/typescript-estree" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" + "@typescript-eslint/scope-manager" "8.6.0" + "@typescript-eslint/types" "8.6.0" + "@typescript-eslint/typescript-estree" "8.6.0" + "@typescript-eslint/visitor-keys" "8.6.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c" - integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== - dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" - -"@typescript-eslint/scope-manager@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1" - integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg== - dependencies: - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" - -"@typescript-eslint/scope-manager@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz#e4babaa39a3d612eff0e3559f3e99c720a2b4a54" - integrity sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A== +"@typescript-eslint/scope-manager@8.6.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.6.0.tgz#28cc2fc26a84b75addf45091a2c6283e29e2c982" + integrity sha512-ZuoutoS5y9UOxKvpc/GkvF4cuEmpokda4wRg64JEia27wX+PysIE9q+lzDtlHHgblwUWwo5/Qn+/WyTUvDwBHw== dependencies: - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" + "@typescript-eslint/types" "8.6.0" + "@typescript-eslint/visitor-keys" "8.6.0" -"@typescript-eslint/type-utils@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz#372dfa470df181bcee0072db464dc778b75ed722" - integrity sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew== +"@typescript-eslint/type-utils@8.6.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.6.0.tgz#d4347e637478bef88cee1db691fcfa20ade9b8a0" + integrity sha512-dtePl4gsuenXVwC7dVNlb4mGDcKjDT/Ropsk4za/ouMBPplCLyznIaR+W65mvCvsyS97dymoBRrioEXI7k0XIg== dependencies: - "@typescript-eslint/typescript-estree" "7.1.0" - "@typescript-eslint/utils" "7.1.0" + "@typescript-eslint/typescript-estree" "8.6.0" + "@typescript-eslint/utils" "8.6.0" debug "^4.3.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/types@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" - integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== + ts-api-utils "^1.3.0" -"@typescript-eslint/types@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" - integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== +"@typescript-eslint/types@8.6.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.6.0.tgz#cdc3a16f83f2f0663d6723e9fd032331cdd9f51c" + integrity sha512-rojqFZGd4MQxw33SrOy09qIDS8WEldM8JWtKQLAjf/X5mGSeEFh5ixQlxssMNyPslVIk9yzWqXCsV2eFhYrYUw== -"@typescript-eslint/types@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.1.0.tgz#52a86d6236fda646e7e5fe61154991dc0dc433ef" - integrity sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA== - -"@typescript-eslint/typescript-estree@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" - integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== +"@typescript-eslint/typescript-estree@8.6.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.6.0.tgz#f945506de42871f04868371cb5bf21e8f7266e01" + integrity sha512-MOVAzsKJIPIlLK239l5s06YXjNqpKTVhBVDnqUumQJja5+Y94V3+4VUFRA0G60y2jNnTVwRCkhyGQpavfsbq/g== dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" + "@typescript-eslint/types" "8.6.0" + "@typescript-eslint/visitor-keys" "8.6.0" debug "^4.3.4" - globby "^11.1.0" + fast-glob "^3.3.2" is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" + minimatch "^9.0.4" + semver "^7.6.0" + ts-api-utils "^1.3.0" -"@typescript-eslint/typescript-estree@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46" - integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ== - dependencies: - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/visitor-keys" "6.21.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - minimatch "9.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/typescript-estree@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz#419b1310f061feee6df676c5bed460537310c593" - integrity sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ== - dependencies: - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - minimatch "9.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/utils@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" - integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@types/json-schema" "^7.0.9" - "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" - eslint-scope "^5.1.1" - semver "^7.3.7" - -"@typescript-eslint/utils@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.1.0.tgz#710ecda62aff4a3c8140edabf3c5292d31111ddd" - integrity sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "7.1.0" - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/typescript-estree" "7.1.0" - semver "^7.5.4" - -"@typescript-eslint/utils@^6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134" - integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ== +"@typescript-eslint/utils@8.6.0", "@typescript-eslint/utils@^8.1.0", "@typescript-eslint/utils@^8.4.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.6.0.tgz#175fe893f32804bed1e72b3364ea6bbe1044181c" + integrity sha512-eNp9cWnYf36NaOVjkEUznf6fEgVy1TWpE0o52e4wtojjBx7D1UV2WAWGzR+8Y5lVFtpMLPwNbC67T83DWSph4A== dependencies: "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.21.0" - "@typescript-eslint/types" "6.21.0" - "@typescript-eslint/typescript-estree" "6.21.0" - semver "^7.5.4" - -"@typescript-eslint/visitor-keys@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" - integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== - dependencies: - "@typescript-eslint/types" "5.62.0" - eslint-visitor-keys "^3.3.0" + "@typescript-eslint/scope-manager" "8.6.0" + "@typescript-eslint/types" "8.6.0" + "@typescript-eslint/typescript-estree" "8.6.0" -"@typescript-eslint/visitor-keys@6.21.0": - version "6.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47" - integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A== +"@typescript-eslint/visitor-keys@8.6.0": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.6.0.tgz#5432af4a1753f376f35ab5b891fc9db237aaf76f" + integrity sha512-wapVFfZg9H0qOYh4grNVQiMklJGluQrOUiOhYRrQWhx7BY/+I1IYb8BczWNbbUpO+pqy0rDciv3lQH5E1bCLrg== dependencies: - "@typescript-eslint/types" "6.21.0" - eslint-visitor-keys "^3.4.1" + "@typescript-eslint/types" "8.6.0" + eslint-visitor-keys "^3.4.3" -"@typescript-eslint/visitor-keys@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz#576c4ad462ca1378135a55e2857d7aced96ce0a0" - integrity sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA== +"@voxpelli/config-array-find-files@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@voxpelli/config-array-find-files/-/config-array-find-files-0.1.2.tgz#6da222d833e5e49312d195b2fc91026869d46a70" + integrity sha512-jOva73R+0Nc5/pyS/piBSjQzO4EehME7rPSkBpPC9PYSta+yj3OpF14v0m0HLLYLVNuyHbBjQh5QvGIZwTH2eA== dependencies: - "@typescript-eslint/types" "7.1.0" - eslint-visitor-keys "^3.4.1" - -"@ungap/structured-clone@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" - integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== + "@nodelib/fs.walk" "^2.0.0" abbrev@1: version "1.1.1" @@ -835,10 +841,10 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^8.11.3, acorn@^8.9.0: - version "8.11.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== +acorn@^8.11.3, acorn@^8.12.0: + version "8.12.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" + integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== agent-base@6: version "6.0.2" @@ -901,6 +907,14 @@ ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + "aproba@^1.0.3 || ^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" @@ -924,79 +938,11 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== - dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== -array-includes@^3.1.7: - version "3.1.7" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" - integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-string "^1.0.7" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array.prototype.findlastindex@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" - integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - get-intrinsic "^1.2.1" - -array.prototype.flat@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" - integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - -array.prototype.flatmap@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" - integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - -arraybuffer.prototype.slice@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" - integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== - dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-array-buffer "^3.0.2" - is-shared-array-buffer "^1.0.2" - arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -1017,13 +963,6 @@ atomic-sleep@^1.0.0: resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== -available-typed-arrays@^1.0.5, available-typed-arrays@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" - integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== - dependencies: - possible-typed-array-names "^1.0.0" - avvio@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/avvio/-/avvio-8.3.0.tgz#1e019433d935730b814978a583eefac41a65082f" @@ -1044,6 +983,11 @@ base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +binary-extensions@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" + integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== + body-parser@1.20.2: version "1.20.2" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" @@ -1084,6 +1028,13 @@ braces@^3.0.2: dependencies: fill-range "^7.0.1" +braces@~3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== + dependencies: + fill-range "^7.1.1" + buffer-image-size@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/buffer-image-size/-/buffer-image-size-0.6.4.tgz#357e8173e951ced3b5a2785c695993aa29dbcac4" @@ -1104,19 +1055,29 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" +bundle-name@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889" + integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q== + dependencies: + run-applescript "^7.0.0" + +bundle-require@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-5.0.0.tgz#071521bdea6534495cf23e92a83f889f91729e93" + integrity sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w== + dependencies: + load-tsconfig "^0.2.3" + bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -call-bind@^1.0.2, call-bind@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" - integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== - dependencies: - function-bind "^1.1.2" - get-intrinsic "^1.2.1" - set-function-length "^1.1.1" +cac@^6.7.14: + version "6.7.14" + resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959" + integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ== call-bind@^1.0.7: version "1.0.7" @@ -1188,6 +1149,21 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chokidar@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -1278,6 +1254,11 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +confbox@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579" + integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA== + config@^3.3.8: version "3.3.11" resolved "https://registry.yarnpkg.com/config/-/config-3.3.11.tgz#009e802631363e456d4cf57767a65c1549069ba2" @@ -1285,6 +1266,11 @@ config@^3.3.8: dependencies: json5 "^2.2.3" +consola@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f" + integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ== + console-control-strings@^1.0.0, console-control-strings@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -1302,6 +1288,11 @@ content-type@~1.0.4, content-type@~1.0.5: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== +cookie-es@^1.1.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.2.2.tgz#18ceef9eb513cac1cb6c14bcbf8bdb2679b34821" + integrity sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg== + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -1326,6 +1317,11 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" +crossws@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/crossws/-/crossws-0.2.4.tgz#82a8b518bff1018ab1d21ced9e35ffbe1681ad03" + integrity sha512-DAxroI2uSOgUKLz00NX6A8U/8EE3SZHmIND+10jkVSaypvyt57J5JEOxAQOL6lQxyzi/wZbTIwssU1uy69h5Vg== + data-uri-to-buffer@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e" @@ -1343,7 +1339,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.0, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1357,6 +1353,13 @@ debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.3.1, debug@^4.3.2: + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== + dependencies: + ms "^2.1.3" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" @@ -1392,16 +1395,20 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -define-data-property@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== +default-browser-id@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26" + integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA== + +default-browser@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf" + integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg== dependencies: - get-intrinsic "^1.2.1" - gopd "^1.0.1" - has-property-descriptors "^1.0.0" + bundle-name "^4.1.0" + default-browser-id "^5.0.0" -define-data-property@^1.1.2, define-data-property@^1.1.4: +define-data-property@^1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== @@ -1410,14 +1417,15 @@ define-data-property@^1.1.2, define-data-property@^1.1.4: es-errors "^1.3.0" gopd "^1.0.1" -define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" - integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== - dependencies: - define-data-property "^1.0.1" - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== + +defu@^6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479" + integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg== del-cli@^5.0.0: version "5.1.0" @@ -1461,16 +1469,26 @@ depd@2.0.0: resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +destr@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.3.tgz#7f9e97cb3d16dbdca7be52aca1644ce402cfe449" + integrity sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ== + destroy@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-libc@^2.0.0, detect-libc@^2.0.2: +detect-libc@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw== +detect-libc@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" + integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -1478,13 +1496,6 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -1522,14 +1533,6 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -enhanced-resolve@^5.12.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" - integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - envalid@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/envalid/-/envalid-7.3.1.tgz#5bf6bbb4effab2d64a1991d8078b4ae38924f0d2" @@ -1554,51 +1557,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.22.1: - version "1.22.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" - integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== - dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.2" - available-typed-arrays "^1.0.5" - call-bind "^1.0.5" - es-set-tostringtag "^2.0.1" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.6" - get-intrinsic "^1.2.2" - get-symbol-description "^1.0.0" - globalthis "^1.0.3" - gopd "^1.0.1" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-typed-array "^1.1.12" - is-weakref "^1.0.2" - object-inspect "^1.13.1" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - safe-array-concat "^1.0.1" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.8" - string.prototype.trimend "^1.0.7" - string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.0" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.13" - es-define-property@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" @@ -1611,30 +1569,34 @@ es-errors@^1.3.0: resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -es-set-tostringtag@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" - integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== - dependencies: - get-intrinsic "^1.2.2" - has-tostringtag "^1.0.0" - hasown "^2.0.0" - -es-shim-unscopables@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" - integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== - dependencies: - hasown "^2.0.0" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" +esbuild@^0.21.5: + version "0.21.5" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" + integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw== + optionalDependencies: + "@esbuild/aix-ppc64" "0.21.5" + "@esbuild/android-arm" "0.21.5" + "@esbuild/android-arm64" "0.21.5" + "@esbuild/android-x64" "0.21.5" + "@esbuild/darwin-arm64" "0.21.5" + "@esbuild/darwin-x64" "0.21.5" + "@esbuild/freebsd-arm64" "0.21.5" + "@esbuild/freebsd-x64" "0.21.5" + "@esbuild/linux-arm" "0.21.5" + "@esbuild/linux-arm64" "0.21.5" + "@esbuild/linux-ia32" "0.21.5" + "@esbuild/linux-loong64" "0.21.5" + "@esbuild/linux-mips64el" "0.21.5" + "@esbuild/linux-ppc64" "0.21.5" + "@esbuild/linux-riscv64" "0.21.5" + "@esbuild/linux-s390x" "0.21.5" + "@esbuild/linux-x64" "0.21.5" + "@esbuild/netbsd-x64" "0.21.5" + "@esbuild/openbsd-x64" "0.21.5" + "@esbuild/sunos-x64" "0.21.5" + "@esbuild/win32-arm64" "0.21.5" + "@esbuild/win32-ia32" "0.21.5" + "@esbuild/win32-x64" "0.21.5" escape-html@~1.0.3: version "1.0.3" @@ -1670,126 +1632,73 @@ eslint-import-resolver-node@^0.3.9: is-core-module "^2.13.0" resolve "^1.22.4" -eslint-import-resolver-typescript@^3.5.2: - version "3.6.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa" - integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg== +eslint-plugin-import-x@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import-x/-/eslint-plugin-import-x-4.2.1.tgz#575f311d51d960f46609dfa3fea9f027cd0cf60b" + integrity sha512-WWi2GedccIJa0zXxx3WDnTgouGQTtdYK1nhXMwywbqqAgB0Ov+p1pYBsWh3VaB0bvBOwLse6OfVII7jZD9xo5Q== dependencies: + "@typescript-eslint/utils" "^8.1.0" debug "^4.3.4" - enhanced-resolve "^5.12.0" - eslint-module-utils "^2.7.4" - fast-glob "^3.3.1" - get-tsconfig "^4.5.0" - is-core-module "^2.11.0" - is-glob "^4.0.3" - -eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== - dependencies: - debug "^3.2.7" - -eslint-plugin-import@^2.26.0: - version "2.29.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643" - integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== - dependencies: - array-includes "^3.1.7" - array.prototype.findlastindex "^1.2.3" - array.prototype.flat "^1.3.2" - array.prototype.flatmap "^1.3.2" - debug "^3.2.7" - doctrine "^2.1.0" + doctrine "^3.0.0" eslint-import-resolver-node "^0.3.9" - eslint-module-utils "^2.8.0" - hasown "^2.0.0" - is-core-module "^2.13.1" + get-tsconfig "^4.7.3" is-glob "^4.0.3" - minimatch "^3.1.2" - object.fromentries "^2.0.7" - object.groupby "^1.0.1" - object.values "^1.1.7" - semver "^6.3.1" - tsconfig-paths "^3.15.0" - -eslint-plugin-require-extensions@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-require-extensions/-/eslint-plugin-require-extensions-0.1.3.tgz#394aeab433f996797a6ceba0a3f75640d4846bc8" - integrity sha512-T3c1PZ9PIdI3hjV8LdunfYI8gj017UQjzAnCrxuo3wAjneDbTPHdE3oNWInOjMA+z/aBkUtlW5vC0YepYMZIug== - -eslint-plugin-simple-import-sort@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.0.0.tgz#3cfa05d74509bd4dc329a956938823812194dbb6" - integrity sha512-8o0dVEdAkYap0Cn5kNeklaKcT1nUsa3LITWEuFk3nJifOoD+5JQGoyDUW2W/iPWwBsNBJpyJS9y4je/BgxLcyQ== + minimatch "^9.0.3" + semver "^7.6.3" + stable-hash "^0.0.4" + tslib "^2.6.3" -eslint-plugin-sort@^2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-sort/-/eslint-plugin-sort-2.11.0.tgz#45d8725a94de76a3f0212f16dd81abc4dc65a199" - integrity sha512-Rvt4XZI42KfyBvjvtcoKFEWg6L/nAKfMBagxKwipNfQd6zetwyHgh284XC1rlRzxY7scn0yfKgqdMILQIyKdlA== - dependencies: - "@typescript-eslint/experimental-utils" "^5.54.1" - isomorphic-resolve "^1.0.0" - natural-compare "^1.4.0" - -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-scope@^7.2.2: - version "7.2.2" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" - integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== +eslint-scope@^8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.2.tgz#5cbb33d4384c9136083a71190d548158fe128f94" + integrity sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@^8.1.0: - version "8.57.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" - integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== +eslint-visitor-keys@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb" + integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== + +eslint@^9.0.0: + version "9.10.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.10.0.tgz#0bd74d7fe4db77565d0e7f57c7df6d2b04756806" + integrity sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.57.0" - "@humanwhocodes/config-array" "^0.11.14" + "@eslint-community/regexpp" "^4.11.0" + "@eslint/config-array" "^0.18.0" + "@eslint/eslintrc" "^3.1.0" + "@eslint/js" "9.10.0" + "@eslint/plugin-kit" "^0.1.0" "@humanwhocodes/module-importer" "^1.0.1" + "@humanwhocodes/retry" "^0.3.0" "@nodelib/fs.walk" "^1.2.8" - "@ungap/structured-clone" "^1.2.0" ajv "^6.12.4" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.3.2" - doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.2.2" - eslint-visitor-keys "^3.4.3" - espree "^9.6.1" - esquery "^1.4.2" + eslint-scope "^8.0.2" + eslint-visitor-keys "^4.0.0" + espree "^10.1.0" + esquery "^1.5.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" + file-entry-cache "^8.0.0" find-up "^5.0.0" glob-parent "^6.0.2" - globals "^13.19.0" - graphemer "^1.4.0" ignore "^5.2.0" imurmurhash "^0.1.4" is-glob "^4.0.0" is-path-inside "^3.0.3" - js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" lodash.merge "^4.6.2" minimatch "^3.1.2" natural-compare "^1.4.0" @@ -1797,19 +1706,19 @@ eslint@^8.1.0: strip-ansi "^6.0.1" text-table "^0.2.0" -espree@^9.6.0, espree@^9.6.1: - version "9.6.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" - integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== +espree@^10.0.1, espree@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56" + integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA== dependencies: - acorn "^8.9.0" + acorn "^8.12.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.1" + eslint-visitor-keys "^4.0.0" -esquery@^1.4.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" - integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== +esquery@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7" + integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg== dependencies: estraverse "^5.1.0" @@ -1820,11 +1729,6 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" @@ -1902,7 +1806,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1: +fast-glob@^3.3.0, fast-glob@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -1975,7 +1879,7 @@ fastify@^4.23.2: semver "^7.5.4" toad-cache "^3.3.0" -fastq@^1.17.1, fastq@^1.6.0: +fastq@^1.15.0, fastq@^1.17.1, fastq@^1.6.0: version "1.17.1" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== @@ -1995,12 +1899,12 @@ fetch-blob@^3.1.2, fetch-blob@^3.1.4: node-domexception "^1.0.0" web-streams-polyfill "^3.0.3" -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== +file-entry-cache@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f" + integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ== dependencies: - flat-cache "^3.0.4" + flat-cache "^4.0.0" file-type@^18.0.0: version "18.7.0" @@ -2018,6 +1922,13 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== + dependencies: + to-regex-range "^5.0.1" + finalhandler@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" @@ -2048,14 +1959,22 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -flat-cache@^3.0.4: - version "3.2.0" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" - integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== +find-up@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-7.0.0.tgz#e8dec1455f74f78d888ad65bf7ca13dd2b4e66fb" + integrity sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g== + dependencies: + locate-path "^7.2.0" + path-exists "^5.0.0" + unicorn-magic "^0.1.0" + +flat-cache@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c" + integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw== dependencies: flatted "^3.2.9" - keyv "^4.5.3" - rimraf "^3.0.2" + keyv "^4.5.4" flatted@^3.2.9: version "3.3.1" @@ -2067,13 +1986,6 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -2117,26 +2029,16 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -function.prototype.name@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" - integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - functions-have-names "^1.2.3" - -functions-have-names@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== - gauge@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" @@ -2152,7 +2054,7 @@ gauge@^3.0.0: strip-ansi "^6.0.1" wide-align "^1.1.2" -get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.2: +get-intrinsic@^1.1.3, get-intrinsic@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== @@ -2162,7 +2064,7 @@ get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.2: has-symbols "^1.0.3" hasown "^2.0.0" -get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: +get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== @@ -2173,22 +2075,19 @@ get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: has-symbols "^1.0.3" hasown "^2.0.0" -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" +get-port-please@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.2.tgz#502795e56217128e4183025c89a48c71652f4e49" + integrity sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ== -get-tsconfig@^4.5.0: - version "4.7.2" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce" - integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A== +get-tsconfig@^4.7.3: + version "4.8.1" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471" + integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg== dependencies: resolve-pkg-maps "^1.0.0" -glob-parent@^5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -2214,31 +2113,10 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -globals@^13.19.0: - version "13.24.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" - integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== - dependencies: - type-fest "^0.20.2" - -globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -globby@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" +globals@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e" + integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== globby@^13.1.2: version "13.2.2" @@ -2258,7 +2136,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.2.10, graceful-fs@^4.2.4: +graceful-fs@^4.2.10: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -2268,16 +2146,27 @@ graphemer@^1.4.0: resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== +h3@^1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/h3/-/h3-1.12.0.tgz#9d7f05f08a997d263e484b02436cb027df3026d8" + integrity sha512-Zi/CcNeWBXDrFNlV0hUBJQR9F7a96RjMeAZweW/ZWkR9fuXrMcvKnSA63f/zZ9l0GgQOZDVHGvXivNN9PWOwhA== + dependencies: + cookie-es "^1.1.0" + crossws "^0.2.4" + defu "^6.1.4" + destr "^2.0.3" + iron-webcrypto "^1.1.1" + ohash "^1.1.3" + radix3 "^1.1.2" + ufo "^1.5.3" + uncrypto "^0.1.3" + unenv "^1.9.0" + hard-rejection@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -has-bigints@^1.0.1, has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -2288,37 +2177,23 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: +has-property-descriptors@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== dependencies: get-intrinsic "^1.2.2" -has-property-descriptors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" - integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== - dependencies: - es-define-property "^1.0.0" - has-proto@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== -has-symbols@^1.0.2, has-symbols@^1.0.3: +has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0, has-tostringtag@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" - integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== - dependencies: - has-symbols "^1.0.3" - has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -2331,6 +2206,13 @@ hasown@^2.0.0: dependencies: function-bind "^1.1.2" +hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + hosted-git-info@^4.0.1: version "4.1.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" @@ -2369,7 +2251,12 @@ ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.2.0, ignore@^5.2.4: +ignore@^5.2.0, ignore@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" + integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== + +ignore@^5.2.4: version "5.3.1" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== @@ -2405,27 +2292,15 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -internal-slot@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" - integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== - dependencies: - get-intrinsic "^1.2.2" - hasown "^2.0.0" - side-channel "^1.0.4" - ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.4" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" - integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" +iron-webcrypto@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz#aa60ff2aa10550630f4c0b11fd2442becdb35a6f" + integrity sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg== is-arrayish@^0.2.1: version "0.2.1" @@ -2437,39 +2312,31 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== dependencies: - has-bigints "^1.0.1" + binary-extensions "^2.0.0" -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== +is-core-module@^2.13.0: + version "2.15.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + hasown "^2.0.2" -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" - integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== - -is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0: +is-core-module@^2.5.0: version "2.13.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== dependencies: hasown "^2.0.0" -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== is-extglob@^2.1.1: version "2.1.1" @@ -2481,24 +2348,19 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== - -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== dependencies: - has-tostringtag "^1.0.0" + is-docker "^3.0.0" is-number@^7.0.0: version "7.0.0" @@ -2525,69 +2387,23 @@ is-plain-obj@^1.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" - is-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: - version "1.1.13" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" - integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== - dependencies: - which-typed-array "^1.1.14" - -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== +is-wsl@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" + integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== dependencies: - call-bind "^1.0.2" - -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + is-inside-container "^1.0.0" isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isomorphic-resolve@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isomorphic-resolve/-/isomorphic-resolve-1.0.0.tgz#477ef131eda1212c2e896883b564d9ac40e749ce" - integrity sha512-FWn6176keSYAapzv5P6ZzLdbCXj5uaG49h1y+EXRNqZm2RBztzBOYqCMmSe4Dmo+bIvk7sX/SN4pI/3QmfH3aw== - javascript-natural-sort@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" @@ -2647,19 +2463,12 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== -json5@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== - dependencies: - minimist "^1.2.0" - json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -keyv@^4.5.3: +keyv@^4.5.4: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== @@ -2698,6 +2507,11 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +load-tsconfig@^0.2.3: + version "0.2.5" + resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.5.tgz#453b8cd8961bfb912dea77eb6c168fe8cca3d3a1" + integrity sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg== + locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -2705,6 +2519,13 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +locate-path@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" + integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== + dependencies: + p-locate "^6.0.0" + lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -2829,6 +2650,11 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" + integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A== + mimic-response@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" @@ -2839,20 +2665,20 @@ min-indent@^1.0.1: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" +minimatch@^9.0.3, minimatch@^9.0.4, minimatch@^9.0.5: + version "9.0.5" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" + integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -2862,11 +2688,6 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.0, minimist@^1.2.6: - version "1.2.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== - minipass@^3.0.0: version "3.3.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" @@ -2892,6 +2713,16 @@ mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +mlly@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.1.tgz#e0336429bb0731b6a8e887b438cbdae522c8f32f" + integrity sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA== + dependencies: + acorn "^8.11.3" + pathe "^1.1.2" + pkg-types "^1.1.1" + ufo "^1.5.3" + moment-timezone@^0.5.39: version "0.5.45" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c" @@ -2904,6 +2735,11 @@ moment@^2.29.4: resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== +mrmime@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4" + integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -2914,7 +2750,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.1.1: +ms@2.1.3, ms@^2.1.1, ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -2939,6 +2775,11 @@ node-domexception@^1.0.0: resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== +node-fetch-native@^1.6.4: + version "1.6.4" + resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.6.4.tgz#679fc8fd8111266d47d7e72c379f1bed9acff06e" + integrity sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ== + node-fetch@^2.6.7: version "2.7.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" @@ -2977,6 +2818,11 @@ normalize-package-data@^3.0.2: semver "^7.3.4" validate-npm-package-license "^3.0.1" +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + npmlog@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" @@ -2997,54 +2843,16 @@ object-inspect@^1.13.1: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== -object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object.assign@^4.1.4: - version "4.1.5" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" - integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== - dependencies: - call-bind "^1.0.5" - define-properties "^1.2.1" - has-symbols "^1.0.3" - object-keys "^1.1.1" - -object.fromentries@^2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" - integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -object.groupby@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" - integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - -object.values@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" - integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - obuf@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +ohash@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.4.tgz#ae8d83014ab81157d2c285abf7792e2995fadd72" + integrity sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g== + on-exit-leak-free@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8" @@ -3071,17 +2879,27 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" +open@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1" + integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw== + dependencies: + default-browser "^5.2.1" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^3.1.0" + optionator@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" - integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== + version "0.9.4" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" + integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g== dependencies: - "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" + word-wrap "^1.2.5" opusscript@^0.0.8: version "0.0.8" @@ -3095,6 +2913,13 @@ p-limit@^3.0.2: dependencies: yocto-queue "^0.1.0" +p-limit@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" + integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== + dependencies: + yocto-queue "^1.0.0" + p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -3102,6 +2927,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-locate@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" + integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== + dependencies: + p-limit "^4.0.0" + p-map@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715" @@ -3146,6 +2978,11 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +path-exists@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" + integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -3171,6 +3008,11 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== +pathe@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec" + integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ== + pb-text-format-to-json@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/pb-text-format-to-json/-/pb-text-format-to-json-1.1.2.tgz#a542ea03c209ad1c3ccbe77d3dc5e7589299d63f" @@ -3259,15 +3101,20 @@ pgpass@1.x: dependencies: split2 "^4.1.0" -picomatch@^2.3.1: +picocolors@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" + integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -picomatch@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.1.tgz#68c26c8837399e5819edce48590412ea07f17a07" - integrity sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg== +picomatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" + integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== pino-abstract-transport@v1.1.0: version "1.1.0" @@ -3299,10 +3146,14 @@ pino@^8.17.0: sonic-boom "^3.7.0" thread-stream "^2.0.0" -possible-typed-array-names@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" - integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== +pkg-types@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.2.0.tgz#d0268e894e93acff11a6279de147e83354ebd42d" + integrity sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA== + dependencies: + confbox "^0.1.7" + mlly "^1.7.1" + pathe "^1.1.2" postgres-array@~2.0.0: version "2.0.0" @@ -3415,6 +3266,11 @@ quick-lru@^5.1.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== +radix3@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.2.tgz#fd27d2af3896c6bf4bcdfab6427c69c2afc69ec0" + integrity sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA== + range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -3476,6 +3332,13 @@ readable-web-to-node-stream@^3.0.2: dependencies: readable-stream "^3.6.0" +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + real-require@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78" @@ -3494,15 +3357,6 @@ regenerator-runtime@^0.14.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== -regexp.prototype.flags@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" - integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - set-function-name "^2.0.0" - require-from-string@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" @@ -3549,37 +3403,23 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -run-parallel@^1.1.9: +run-applescript@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb" + integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A== + +run-parallel@^1.1.9, run-parallel@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== dependencies: queue-microtask "^1.2.2" -safe-array-concat@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" - integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg== - dependencies: - call-bind "^1.0.5" - get-intrinsic "^1.2.2" - has-symbols "^1.0.3" - isarray "^2.0.5" - safe-buffer@5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex-test@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5" - integrity sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ== - dependencies: - call-bind "^1.0.5" - get-intrinsic "^1.2.2" - is-regex "^1.1.4" - safe-regex2@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/safe-regex2/-/safe-regex2-2.0.0.tgz#b287524c397c7a2994470367e0185e1916b1f5b9" @@ -3607,12 +3447,12 @@ seedrandom@^3.0.5: resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg== -semver@^6.0.0, semver@^6.3.1: +semver@^6.0.0: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: +semver@^7.3.4, semver@^7.3.5: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -3626,6 +3466,11 @@ semver@^7.5.4: dependencies: lru-cache "^6.0.0" +semver@^7.6.0, semver@^7.6.3: + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -3665,7 +3510,7 @@ set-cookie-parser@^2.4.1: resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51" integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ== -set-function-length@^1.1.1, set-function-length@^1.2.1: +set-function-length@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== @@ -3677,49 +3522,39 @@ set-function-length@^1.1.1, set-function-length@^1.2.1: gopd "^1.0.1" has-property-descriptors "^1.0.1" -set-function-name@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" - integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== - dependencies: - define-data-property "^1.1.4" - es-errors "^1.3.0" - functions-have-names "^1.2.3" - has-property-descriptors "^1.0.2" - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== -sharp@^0.33.2: - version "0.33.2" - resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.2.tgz#fcd52f2c70effa8a02160b1bfd989a3de55f2dfb" - integrity sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ== +sharp@^0.33.4: + version "0.33.5" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.5.tgz#13e0e4130cc309d6a9497596715240b2ec0c594e" + integrity sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw== dependencies: color "^4.2.3" - detect-libc "^2.0.2" - semver "^7.5.4" + detect-libc "^2.0.3" + semver "^7.6.3" optionalDependencies: - "@img/sharp-darwin-arm64" "0.33.2" - "@img/sharp-darwin-x64" "0.33.2" - "@img/sharp-libvips-darwin-arm64" "1.0.1" - "@img/sharp-libvips-darwin-x64" "1.0.1" - "@img/sharp-libvips-linux-arm" "1.0.1" - "@img/sharp-libvips-linux-arm64" "1.0.1" - "@img/sharp-libvips-linux-s390x" "1.0.1" - "@img/sharp-libvips-linux-x64" "1.0.1" - "@img/sharp-libvips-linuxmusl-arm64" "1.0.1" - "@img/sharp-libvips-linuxmusl-x64" "1.0.1" - "@img/sharp-linux-arm" "0.33.2" - "@img/sharp-linux-arm64" "0.33.2" - "@img/sharp-linux-s390x" "0.33.2" - "@img/sharp-linux-x64" "0.33.2" - "@img/sharp-linuxmusl-arm64" "0.33.2" - "@img/sharp-linuxmusl-x64" "0.33.2" - "@img/sharp-wasm32" "0.33.2" - "@img/sharp-win32-ia32" "0.33.2" - "@img/sharp-win32-x64" "0.33.2" + "@img/sharp-darwin-arm64" "0.33.5" + "@img/sharp-darwin-x64" "0.33.5" + "@img/sharp-libvips-darwin-arm64" "1.0.4" + "@img/sharp-libvips-darwin-x64" "1.0.4" + "@img/sharp-libvips-linux-arm" "1.0.5" + "@img/sharp-libvips-linux-arm64" "1.0.4" + "@img/sharp-libvips-linux-s390x" "1.0.4" + "@img/sharp-libvips-linux-x64" "1.0.4" + "@img/sharp-libvips-linuxmusl-arm64" "1.0.4" + "@img/sharp-libvips-linuxmusl-x64" "1.0.4" + "@img/sharp-linux-arm" "0.33.5" + "@img/sharp-linux-arm64" "0.33.5" + "@img/sharp-linux-s390x" "0.33.5" + "@img/sharp-linux-x64" "0.33.5" + "@img/sharp-linuxmusl-arm64" "0.33.5" + "@img/sharp-linuxmusl-x64" "0.33.5" + "@img/sharp-wasm32" "0.33.5" + "@img/sharp-win32-ia32" "0.33.5" + "@img/sharp-win32-x64" "0.33.5" shebang-command@^2.0.0: version "2.0.0" @@ -3769,11 +3604,6 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - slash@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" @@ -3817,6 +3647,11 @@ split2@^4.0.0, split2@^4.1.0: resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== +stable-hash@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.4.tgz#55ae7dadc13e4b3faed13601587cec41859b42f7" + integrity sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g== + stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -3836,33 +3671,6 @@ statuses@2.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.prototype.trim@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" - integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -string.prototype.trimend@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" - integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -string.prototype.trimstart@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" - integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - string_decoder@^1.1.1, string_decoder@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -3877,11 +3685,6 @@ strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== - strip-indent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853" @@ -3921,11 +3724,6 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - tar@^6.1.11: version "6.2.0" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" @@ -4000,42 +3798,25 @@ triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== -ts-api-utils@^1.0.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.2.1.tgz#f716c7e027494629485b21c0df6180f4d08f5e8b" - integrity sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA== - -tsconfig-paths@^3.15.0: - version "3.15.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" - integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.2" - minimist "^1.2.6" - strip-bom "^3.0.0" +ts-api-utils@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" + integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== tslib@2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - tslib@^2.4.0: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" +tslib@^2.6.3: + version "2.7.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" + integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== tweetnacl@^1.0.3: version "1.0.3" @@ -4049,11 +3830,6 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2: version "1.4.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" @@ -4067,70 +3843,56 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typed-array-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" - integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - is-typed-array "^1.1.10" - -typed-array-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" - integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" - -typed-array-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" - integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" - -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - is-typed-array "^1.1.9" - typed-function@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-4.1.1.tgz#38ce3cae31f4f513bcb263563fdad27b2afa73e8" integrity sha512-Pq1DVubcvibmm8bYcMowjVnnMwPVMeh0DIdA8ad8NZY2sJgapANJmiigSUwlt+EgXxpfIv8MWrQXTIzkfYZLYQ== +typescript-eslint@^8.6.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.6.0.tgz#5f0b5e23b34385ef146e447616c1a0d6bd14bedb" + integrity sha512-eEhhlxCEpCd4helh3AO1hk0UP2MvbRi9CtIAJTVPQjuSXOOO2jsEacNi4UdcJzZJbeuVg1gMhtZ8UYb+NFYPrA== + dependencies: + "@typescript-eslint/eslint-plugin" "8.6.0" + "@typescript-eslint/parser" "8.6.0" + "@typescript-eslint/utils" "8.6.0" + typescript@^5.4.0: version "5.4.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ== -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== - dependencies: - call-bind "^1.0.2" - has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" +ufo@^1.5.3: + version "1.5.4" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754" + integrity sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ== + +uncrypto@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b" + integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q== undici-types@~5.26.4: version "5.26.5" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== +unenv@^1.9.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/unenv/-/unenv-1.10.0.tgz#c3394a6c6e4cfe68d699f87af456fe3f0db39571" + integrity sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ== + dependencies: + consola "^3.2.3" + defu "^6.1.4" + mime "^3.0.0" + node-fetch-native "^1.6.4" + pathe "^1.1.2" + +unicorn-magic@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4" + integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ== + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -4197,28 +3959,6 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - -which-typed-array@^1.1.13, which-typed-array@^1.1.14: - version "1.1.14" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.14.tgz#1f78a111aee1e131ca66164d8bdc3ab062c95a06" - integrity sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg== - dependencies: - available-typed-arrays "^1.0.6" - call-bind "^1.0.5" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.1" - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -4259,11 +3999,21 @@ winston@^3.11.0: triple-beam "^1.3.0" winston-transport "^4.5.0" +word-wrap@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== +ws@^8.18.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== + ws@^8.2.3: version "8.16.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" @@ -4288,3 +4038,8 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +yocto-queue@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110" + integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g== From 8685bfdae8766be8d041e6bcc19f42d32dfbc065 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Tue, 17 Sep 2024 17:09:43 +0200 Subject: [PATCH 03/24] Updated logger methods --- api/routes/sharp/Prisma.ts | 8 +++--- api/routes/sharp/SharpDiscord.ts | 10 ++++---- api/routes/sharp/managers/TextManager.ts | 15 ++++++----- api/routes/sharp/v1/managers/ImageManager.ts | 26 ++++++++++---------- api/routes/sharp/v1/managers/TextManager.ts | 14 +++++------ api/routes/sharp/v2/services/ImageFetcher.ts | 4 +-- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/api/routes/sharp/Prisma.ts b/api/routes/sharp/Prisma.ts index 7fc2d34..fc80375 100644 --- a/api/routes/sharp/Prisma.ts +++ b/api/routes/sharp/Prisma.ts @@ -1,13 +1,13 @@ import { PrismaClient } from '@prisma/client'; -import { NiceLogger } from '../../utils/logging/NiceLogger.js'; +import { DefaultLogger } from '../../utils/logging/NiceLogger'; export default class Prisma { public readonly client: PrismaClient; - public constructor(public readonly logger: NiceLogger) { + public constructor(public readonly logger: DefaultLogger) { this.client = new PrismaClient(); this.client.$connect().then(() => { - this.logger.log('prisma', 'Prisma', 'Connected to Postgres'); - }).catch((e) => logger.log('error', 'Prisma', e)); + this.logger.log.prisma('Connected to Postgres'); + }).catch((e) => logger.log.error('Prisma', e)); } } diff --git a/api/routes/sharp/SharpDiscord.ts b/api/routes/sharp/SharpDiscord.ts index 1a5603c..0e712d1 100644 --- a/api/routes/sharp/SharpDiscord.ts +++ b/api/routes/sharp/SharpDiscord.ts @@ -1,23 +1,23 @@ import Eris, { Client } from 'eris'; -import config from '../../config.json' assert {type: 'json'}; -import { NiceLogger } from '../../utils/logging/NiceLogger.js'; +import config from '../../config.json'; +import { DefaultLogger } from '../../utils/logging/NiceLogger.js'; export class SharpDiscord { private readonly client: Client; private discordLastDisconnect = 0; - public constructor(public readonly logger: NiceLogger) { + public constructor(public readonly logger: DefaultLogger) { this.client = Eris(config.discord.token); // Discord events this.client.on('ready', () => { if (Date.now() - this.discordLastDisconnect > 60000) - logger.log('info', 'Discord', 'Client ready'); + logger.log.info('Discord', 'Client ready'); }); this.client.on('disconnect', () => { this.discordLastDisconnect = Date.now(); }); this.client.on('error', (err) => { - this.logger.log('error', 'Discord', err); + this.logger.log.error('Discord', err); }); void this.client.connect(); } diff --git a/api/routes/sharp/managers/TextManager.ts b/api/routes/sharp/managers/TextManager.ts index d002475..200468e 100644 --- a/api/routes/sharp/managers/TextManager.ts +++ b/api/routes/sharp/managers/TextManager.ts @@ -5,11 +5,10 @@ import { parse } from 'pb-text-format-to-json'; import fs from 'fs'; import { fileURLToPath } from 'url'; -import Timer from './Timer.js'; - +import Timer from '../../../utils/Timer.js'; import { DefaultOptions, InputOptions } from '../../../types/PayloadTypes.js'; import { isErrnoException } from '../../../utils/index.js'; -import { NiceLogger } from '../../../utils/logging/NiceLogger.js'; +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; interface Font { name: string; @@ -35,18 +34,18 @@ export default class TextManager { private readonly fonts: Map; private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../assets/fonts/'; - public constructor(public readonly logger: NiceLogger) { + public constructor(public readonly logger: DefaultLogger) { this.fonts = new Map(); const fontTimer = new Timer(); this.loadFonts().then((responseData) => { const result: unknown[] = ['Loaded', responseData.loaded.length, 'fonts.']; if (responseData.missingMeta.length > 0) result.push(responseData.missingMeta.length, chalk.yellow('fonts don\'t have METADATA.pb')); - this.logger.log('info', 'TextManager', ...result, fontTimer.elapsedBlueStr); + this.logger.log.info('TextManager', ...result, fontTimer.elapsedBlueStr); if (responseData.errors > 0) - this.logger.log('error', 'TextManager', `Encountered ${responseData.errors} errors while loading fonts`); + this.logger.log.error('TextManager', `Encountered ${responseData.errors} errors while loading fonts`); }).catch((err) => { - this.logger.log('error', 'LoadFonts', err); + this.logger.log.error('LoadFonts', err); }); } @@ -320,7 +319,7 @@ export default class TextManager { } return responseData; } catch (err: unknown) { - this.logger.log('error', 'LoadFonts', err); + this.logger.log.error('LoadFonts', err); responseData.errors += 1; return responseData; } diff --git a/api/routes/sharp/v1/managers/ImageManager.ts b/api/routes/sharp/v1/managers/ImageManager.ts index a387fda..0fa3d42 100644 --- a/api/routes/sharp/v1/managers/ImageManager.ts +++ b/api/routes/sharp/v1/managers/ImageManager.ts @@ -12,7 +12,7 @@ import { ImageEditor } from './ImageEditor.js'; import { InputBody } from '../../../../types/PayloadTypes.js'; import CacheManager from '../../../../utils/CacheManager.js'; import { guard } from '../../../../utils/guard/index.js'; -import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Prisma from '../../Prisma.js'; export class ImageManager { @@ -22,7 +22,7 @@ export class ImageManager { private readonly prisma: PrismaClient; private readonly storedImagesPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', 'images', 'stored'); - public constructor(public readonly editor: ImageEditor, public readonly logger: NiceLogger) { + public constructor(public readonly editor: ImageEditor, public readonly logger: DefaultLogger) { this.prisma = new Prisma(logger).client; this.cache = new CacheManager({ refresh: 6, hours: 48 }); this.startImageSweep(); @@ -57,7 +57,7 @@ export class ImageManager { } if (body !== undefined) this.saveImageToDB(fileName, body, persist).catch((err) => { - this.logger.log('error', 'ImageManager', err); + this.logger.log.error('ImageManager', err); }); return fileName; } @@ -95,7 +95,7 @@ export class ImageManager { public writeFile(buffer: Buffer, fileName: string): void { fs.writeFile(path.join(this.storedImagesPath, fileName), buffer, (err) => { if (err !== null) - return this.logger.log('error', 'ImageManager', err); + return this.logger.log.error('ImageManager', err); }); } @@ -134,7 +134,7 @@ export class ImageManager { return buffer; } } catch (e: unknown) { - this.logger.log('error', 'ImageManager', e); + this.logger.log.error('ImageManager', e); } } @@ -147,9 +147,9 @@ export class ImageManager { }).then((image) => { if (image === null) this.saveImageToDB(fileName).then(() => { - this.logger.log('db', 'Prisma', 'Saved (legacy) image to DB'); + this.logger.log.prisma('Saved (legacy) image to DB'); }).catch((err) => { - this.logger.log('db', 'Prisma', err); + this.logger.log.prisma(err); }); else void this.prisma.image.update({ @@ -160,7 +160,7 @@ export class ImageManager { } }); }).catch(() => { - this.logger.log('error', 'Prisma', `Failed to update last accessed for "${fileName}"`); + this.logger.log.error('Prisma', `Failed to update last accessed for "${fileName}"`); }); this.cache.refreshTimestamp(fileName); } @@ -182,13 +182,13 @@ export class ImageManager { if (deletedCount.pg > 0) result.push(`eleted ${deletedCount.pg} images from PG`); if (result.length > 0) - this.logger.log('db', 'Prisma', 'D' + result.join(' and d')); + this.logger.log.prisma('D' + result.join(' and d')); this.prisma.image.count().then((prismaCount) => { fs.readdir(this.storedImagesPath, undefined, (_, files) => { - this.logger.log('db', 'Prisma', `Currently storing ${files.length} images on disk and ${prismaCount} in Prisma`); + this.logger.log.prisma(`Currently storing ${files.length} images on disk and ${prismaCount} in Prisma`); }); - }).catch((err) => this.logger.log('error', 'ImageManager', err)); + }).catch((err) => this.logger.log.error('ImageManager', err)); } private async sweepFsImages(): Promise { @@ -212,7 +212,7 @@ export class ImageManager { this.deleteFile(image.id); deletedN++; } catch (e: unknown) { - this.logger.log('error', 'ImageManager', e); + this.logger.log.error('ImageManager', e); } } return deletedN; @@ -237,7 +237,7 @@ export class ImageManager { try { await this.prisma.image.delete({ where: { id: image.id } }); } catch (e: unknown) { - this.logger.log('error', 'ImageManager', e); + this.logger.log.error('ImageManager', e); } } return deletedN; diff --git a/api/routes/sharp/v1/managers/TextManager.ts b/api/routes/sharp/v1/managers/TextManager.ts index 0fc9721..594b0a9 100644 --- a/api/routes/sharp/v1/managers/TextManager.ts +++ b/api/routes/sharp/v1/managers/TextManager.ts @@ -1,4 +1,4 @@ -import can, { Canvas, CanvasRenderingContext2D } from 'canvas'; +import can, { Canvas, CanvasRenderingContext2D, TextMetrics } from 'canvas'; import chalk from 'chalk'; import { parse } from 'pb-text-format-to-json'; @@ -7,7 +7,7 @@ import { fileURLToPath } from 'url'; import { DefaultOptions, InputOptions } from '../../../../types/PayloadTypes.js'; import { isErrnoException } from '../../../../utils/index.js'; -import { NiceLogger } from '../../../../utils/logging/NiceLogger.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; interface Font { @@ -34,18 +34,18 @@ export default class TextManager { private readonly fonts: Map; private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../assets/fonts/'; - public constructor(public readonly logger: NiceLogger) { + public constructor(public readonly logger: DefaultLogger) { this.fonts = new Map(); const fontTimer = new Timer(); this.loadFonts().then((responseData) => { const result: unknown[] = ['Loaded', responseData.loaded.length, 'fonts.']; if (responseData.missingMeta.length > 0) result.push(responseData.missingMeta.length, chalk.yellow('fonts don\'t have METADATA.pb')); - this.logger.log('info', 'TextManager', ...result, fontTimer.elapsedBlueStr); + this.logger.log.info('TextManager', ...result, fontTimer.elapsedBlueStr); if (responseData.errors > 0) - this.logger.log('error', 'TextManager', `Encountered ${responseData.errors} errors while loading fonts`); + this.logger.log.error('TextManager', `Encountered ${responseData.errors} errors while loading fonts`); }).catch((err) => { - this.logger.log('error', 'LoadFonts', err); + this.logger.log.error('LoadFonts', err); }); } @@ -319,7 +319,7 @@ export default class TextManager { } return responseData; } catch (err: unknown) { - this.logger.log('error', 'LoadFonts', err); + this.logger.log.error('LoadFonts', err); responseData.errors += 1; return responseData; } diff --git a/api/routes/sharp/v2/services/ImageFetcher.ts b/api/routes/sharp/v2/services/ImageFetcher.ts index 53f55fa..2a12018 100644 --- a/api/routes/sharp/v2/services/ImageFetcher.ts +++ b/api/routes/sharp/v2/services/ImageFetcher.ts @@ -5,7 +5,7 @@ import path from 'path'; import url from 'url'; import CacheManager from '../../../../utils/CacheManager.js'; -import { defaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; const transparentImagePath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', 'assets', 'img', 'transparent.png'); @@ -14,7 +14,7 @@ export default class ImageFetcher { public cache: CacheManager<{ buffer: Buffer; }>; public readonly defaultImageBuffer = fs.readFileSync(transparentImagePath); - public constructor(public readonly logger: typeof defaultLogger) { + public constructor(public readonly logger: DefaultLogger) { this.cache = new CacheManager({ refresh: 0.5, hours: 48 }); } From c181baf1fb2f6ba1b6c624bc9aa18ddbbe961955 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Tue, 17 Sep 2024 17:11:31 +0200 Subject: [PATCH 04/24] Remove old eslint file --- .eslintrc.json.disabled | 202 ---------------------------------------- 1 file changed, 202 deletions(-) delete mode 100644 .eslintrc.json.disabled diff --git a/.eslintrc.json.disabled b/.eslintrc.json.disabled deleted file mode 100644 index 698bdc1..0000000 --- a/.eslintrc.json.disabled +++ /dev/null @@ -1,202 +0,0 @@ -{ - "root": true, - "env": { - "node": true - }, - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended-type-checked", - "plugin:import/recommended", - "plugin:import/typescript", - "plugin:require-extensions/recommended" - ], - "parser": "@typescript-eslint/parser", - "plugins": [ - "@stylistic/eslint-plugin", - "@stylistic/ts", - "@typescript-eslint", - "import", - "simple-import-sort", - "require-extensions" - ], - "parserOptions": { - "project": true, - "tsconfigRootDir": "./" - }, - "ignorePatterns": [ - "out/*", - "old/*" - ], - "settings": { - "import/parsers": { - "@typescript-eslint/parser": [ - ".ts", - ".tsx" - ] - }, - "import/resolver": { - "typescript": { - "alwaysTryTypes": true // always try to resolve types under `@types` directory even it doesn't contain any source code, like `@types/unist` - } - } - }, - "rules": { - "@stylistic/no-mixed-spaces-and-tabs": 2, - "@stylistic/ts/lines-between-class-members": [ - "error", - "always", - { - "exceptAfterSingleLine": true, - "exceptAfterOverload": true - } - ], - "@stylistic/object-curly-spacing": [ - "error", "always" - ], - "@stylistic/no-multiple-empty-lines": [ - "error", - { - "max": 1 - } - ], - "@stylistic/operator-linebreak": [ - "error", - "after" - ], - "@stylistic/no-multi-spaces": [ - "error" - ], - "@stylistic/space-infix-ops": "error", - "@stylistic/arrow-spacing": "error", - "@stylistic/block-spacing": "error", - "@stylistic/arrow-parens": ["error", "always"], - "brace-style": [ - "warn", - "1tbs", - { - "allowSingleLine": true - } - ], - "comma-dangle": "warn", - "comma-spacing": "error", - "eol-last": [ - "warn", - "always" - ], - "eqeqeq": "error", - "guard-for-in": "warn", - "import/first": "error", - "import/newline-after-import": "error", - "import/no-duplicates": "error", - "import/no-unresolved": "error", - "indent": [ - "error", - 4, - { - "SwitchCase": 1 - } - ], - "max-statements-per-line": [ - "error", - { - "max": 1 - } - ], - "no-alert": "error", - "no-console": "error", - "no-else-return": "error", - "no-global-assign": "error", - "no-iterator": "error", - "no-lone-blocks": "warn", - "no-lonely-if": "error", - "no-multiple-empty-lines": [ - "warn", - { - "max": 1, - "maxEOF": 0, - "maxBOF": 0 - } - ], - "no-new-func": "error", - "no-proto": "error", - "no-sequences": "error", - "no-trailing-spaces": "warn", - "no-var": "error", - "one-var": [ - "error", - "never" - ], - "one-var-declaration-per-line": [ - "error", - "always" - ], - "quotes": [ - "error", - "single", - { - "avoidEscape": false - } - ], - "semi": [ - 2, - "always" - ], - "simple-import-sort/exports": "error", - "simple-import-sort/imports": "error", - "strict": "error" - }, - "overrides": [ - { - // enable the rule specifically for TypeScript files - "files": [ - "*.ts", - "*.mts", - "*.cts", - "*.tsx" - ], - "plugins": [ - "@typescript-eslint" - ], - "extends": [ - "plugin:@typescript-eslint/recommended-type-checked", - "plugin:@typescript-eslint/stylistic-type-checked" - //"plugin:@typescript-eslint/recommended-requiring-type-checking" - ], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "project": "./tsconfig.json" - }, - "rules": { - "no-console": 1, - "@typescript-eslint/explicit-member-accessibility": "error", - "@typescript-eslint/class-literal-property-style": [ - "error", - "fields" - ], - "@typescript-eslint/return-await": [ - "error", - "always" - ], - "@typescript-eslint/explicit-function-return-type": [ - "error", - { - "allowExpressions": true - } - ], - "@typescript-eslint/strict-boolean-expressions": [ - "error", - { - "allowString": false, - "allowNumber": false, - "allowNullableObject": false, - "allowNullableBoolean": false, - "allowNullableString": false, - "allowNullableNumber": false, - "allowAny": false, - "allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing": true - } - ] - } - } - ] - } \ No newline at end of file From 66a8d6f3c3989b766be2ef96d4a380a05d59af50 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 18 Sep 2024 15:29:26 +0200 Subject: [PATCH 05/24] Fix logging issues --- api/api.ts | 4 ++-- api/utils/logging/NiceLogger.ts | 5 ++++- api/utils/logging/WinstonLogger.ts | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/api/api.ts b/api/api.ts index dcd00b1..e7bb6b0 100644 --- a/api/api.ts +++ b/api/api.ts @@ -1,4 +1,4 @@ -import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; +import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; import http from 'http'; @@ -10,7 +10,7 @@ import env from './utils/env/createEnv.js'; import HttpException from './utils/HttpException.js'; import { defaultLogLevels, NiceLogger } from './utils/logging/NiceLogger.js'; -const logger = new NiceLogger({ levels: defaultLogLevels }); +const logger = new NiceLogger({ levels: defaultLogLevels, defaultLevel: 'verbose' }); const app = express(); app.get('/', (_, res) => { res.redirect('https://api.nicelink.xyz/docs'); diff --git a/api/utils/logging/NiceLogger.ts b/api/utils/logging/NiceLogger.ts index 85c0ffe..ad01df9 100644 --- a/api/utils/logging/NiceLogger.ts +++ b/api/utils/logging/NiceLogger.ts @@ -1,5 +1,7 @@ import chalk, { ChalkInstance } from 'chalk'; +import util from 'util'; + import { createLogger } from './WinstonLogger.js'; type LoggerFunction = (...args: unknown[]) => void; @@ -33,10 +35,11 @@ export class NiceLogger> { for (const level of Object.keys(levels)) { logger[level] = (...args: unknown[]) => { this.logHistory.push({ level, log: args, timestamp: Date.now() }); - (this.#logger[level] as LoggerFunction)(...args); + (this.#logger[level] as LoggerFunction)(util.format(...args)); }; } this.log = logger as Record; + } } diff --git a/api/utils/logging/WinstonLogger.ts b/api/utils/logging/WinstonLogger.ts index ec67615..3e40e1b 100644 --- a/api/utils/logging/WinstonLogger.ts +++ b/api/utils/logging/WinstonLogger.ts @@ -48,6 +48,7 @@ export function createLogger(options: LoggerOptions): CreateWinstonLoggerReturn< function timestampLevelFormat(info: winston.Logform.TransformableInfo): string { return `${chalk.bgWhite.black(padTimestamp((info.timestamp as string)))}${config.colors[info.level](levelPadding(info.level))}`; } + return createWinstonLogger({ level: options.level, levels: config.levels, From aebaf25c4a83fd6f197512bd4bc482b8acb8e29a Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 18 Sep 2024 15:30:15 +0200 Subject: [PATCH 06/24] Fix path issues and json imports --- api/routes/TimezonesRoute.ts | 2 +- api/routes/sharp/SharpDiscord.ts | 2 +- api/routes/sharp/v1/SharpRoute.ts | 2 +- api/routes/sharp/v1/managers/TextManager.ts | 2 +- api/tsconfig.json | 2 +- api/yarn.lock | 44 ++++++++++----------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/api/routes/TimezonesRoute.ts b/api/routes/TimezonesRoute.ts index 3fa86cb..bcfa01e 100644 --- a/api/routes/TimezonesRoute.ts +++ b/api/routes/TimezonesRoute.ts @@ -1,6 +1,6 @@ import { Request, Response, Router } from 'express'; -import timezones from '../assets/data/timezones.json'; +import timezones from '../assets/data/timezones.json' assert {type: 'json'}; export default class TimezonesRoute { public readonly router = Router(); diff --git a/api/routes/sharp/SharpDiscord.ts b/api/routes/sharp/SharpDiscord.ts index 0e712d1..29182cb 100644 --- a/api/routes/sharp/SharpDiscord.ts +++ b/api/routes/sharp/SharpDiscord.ts @@ -1,6 +1,6 @@ import Eris, { Client } from 'eris'; -import config from '../../config.json'; +import config from '../../config.json' assert {type: 'json'}; import { DefaultLogger } from '../../utils/logging/NiceLogger.js'; export class SharpDiscord { diff --git a/api/routes/sharp/v1/SharpRoute.ts b/api/routes/sharp/v1/SharpRoute.ts index 7054c39..c57614b 100644 --- a/api/routes/sharp/v1/SharpRoute.ts +++ b/api/routes/sharp/v1/SharpRoute.ts @@ -5,7 +5,7 @@ import { ImageEditor } from './managers/ImageEditor.js'; import { ImageManager } from './managers/ImageManager.js'; import TextManager from './managers/TextManager.js'; -import config from '../../../config.json'; +import config from '../../../config.json' assert {type: 'json'}; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from '../../../utils/Timer.js'; import { SharpDiscord } from '../SharpDiscord.js'; diff --git a/api/routes/sharp/v1/managers/TextManager.ts b/api/routes/sharp/v1/managers/TextManager.ts index 594b0a9..6ca6309 100644 --- a/api/routes/sharp/v1/managers/TextManager.ts +++ b/api/routes/sharp/v1/managers/TextManager.ts @@ -32,7 +32,7 @@ interface LineProp extends Max { } export default class TextManager { private readonly fonts: Map; - private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../assets/fonts/'; + private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../../assets/fonts/'; public constructor(public readonly logger: DefaultLogger) { this.fonts = new Map(); diff --git a/api/tsconfig.json b/api/tsconfig.json index 6aea77e..bcb6dc5 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "noImplicitAny": true, "strict": true, - "module": "ES2022", + "module": "esnext", "resolveJsonModule": true, "esModuleInterop": true, "target": "ES2022", diff --git a/api/yarn.lock b/api/yarn.lock index 9e0f96c..a5c3da0 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -949,9 +949,9 @@ arrify@^1.0.1: integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== async@^3.2.3: - version "3.2.5" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" - integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + version "3.2.6" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== asynckit@^0.4.0: version "0.4.0" @@ -2536,10 +2536,10 @@ lodash@^4.17.21: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -logform@^2.3.2, logform@^2.4.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.0.tgz#8c82a983f05d6eaeb2d75e3decae7a768b2bf9b5" - integrity sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ== +logform@^2.6.0, logform@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0" + integrity sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA== dependencies: "@colors/colors" "1.6.0" "@types/triple-beam" "^1.3.2" @@ -3305,7 +3305,7 @@ read-pkg@^6.0.0: parse-json "^5.2.0" type-fest "^1.0.1" -readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2: version "3.6.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -3428,9 +3428,9 @@ safe-regex2@^2.0.0: ret "~0.2.0" safe-stable-stringify@^2.3.1: - version "2.4.3" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" - integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== + version "2.5.0" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd" + integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA== "safer-buffer@>= 2.1.2 < 3": version "2.1.2" @@ -3973,31 +3973,31 @@ wide-align@^1.1.2: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -winston-transport@^4.5.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0" - integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg== +winston-transport@^4.7.0: + version "4.7.1" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.1.tgz#52ff1bcfe452ad89991a0aaff9c3b18e7f392569" + integrity sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA== dependencies: - logform "^2.3.2" - readable-stream "^3.6.0" + logform "^2.6.1" + readable-stream "^3.6.2" triple-beam "^1.3.0" winston@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.11.0.tgz#2d50b0a695a2758bb1c95279f0a88e858163ed91" - integrity sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g== + version "3.14.2" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.14.2.tgz#94ce5fd26d374f563c969d12f0cd9c641065adab" + integrity sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg== dependencies: "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0" - logform "^2.4.0" + logform "^2.6.0" one-time "^1.0.0" readable-stream "^3.4.0" safe-stable-stringify "^2.3.1" stack-trace "0.0.x" triple-beam "^1.3.0" - winston-transport "^4.5.0" + winston-transport "^4.7.0" word-wrap@^1.2.5: version "1.2.5" From 4f50abe378f156b366daa1d46725a4aaadd2c84a Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 18 Sep 2024 15:30:29 +0200 Subject: [PATCH 07/24] Remove debugging code --- api/routes/sharp/v2/SharpRoute.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/api/routes/sharp/v2/SharpRoute.ts b/api/routes/sharp/v2/SharpRoute.ts index 7f985db..cea21e9 100644 --- a/api/routes/sharp/v2/SharpRoute.ts +++ b/api/routes/sharp/v2/SharpRoute.ts @@ -1,17 +1,10 @@ import { Router } from 'express'; -import sharp from 'sharp'; - -import fs from 'fs'; -import path from 'path'; -import url from 'url'; import ImageManager from './services/ImageManager.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from '../../../utils/Timer.js'; -const testImageBuffer = fs.readFileSync(path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', 'assets', 'img', 'testImage2.png')); - export default class SharpRoute { public readonly router = Router(); public readonly manager: ImageManager; @@ -19,10 +12,6 @@ export default class SharpRoute { public constructor(public readonly logger: DefaultLogger) { this.manager = new ImageManager(logger); - this.router.get('/testImage.png', (_, res) => { - sharp(testImageBuffer).pipe(res); - }); - this.router.post('/image', (req, res) => { const body = req.body as JObject; const timer = new Timer(true); From 9cc9536d937d323fef412814319fdcbe85857ae5 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 18 Sep 2024 15:30:57 +0200 Subject: [PATCH 08/24] Fixed more path issues --- api/routes/sharp/v2/services/ImageFetcher.ts | 2 +- api/routes/sharp/v2/services/TextManager.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/routes/sharp/v2/services/ImageFetcher.ts b/api/routes/sharp/v2/services/ImageFetcher.ts index 2a12018..af463f5 100644 --- a/api/routes/sharp/v2/services/ImageFetcher.ts +++ b/api/routes/sharp/v2/services/ImageFetcher.ts @@ -8,7 +8,7 @@ import CacheManager from '../../../../utils/CacheManager.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; -const transparentImagePath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', 'assets', 'img', 'transparent.png'); +const transparentImagePath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', 'assets', 'img', 'transparent.png'); export default class ImageFetcher { public cache: CacheManager<{ buffer: Buffer; }>; diff --git a/api/routes/sharp/v2/services/TextManager.ts b/api/routes/sharp/v2/services/TextManager.ts index 41d2d6e..d8b9ec3 100644 --- a/api/routes/sharp/v2/services/TextManager.ts +++ b/api/routes/sharp/v2/services/TextManager.ts @@ -33,16 +33,16 @@ interface LineProp extends Max { export class TextManager { private readonly fonts: Map; - private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../assets/fonts/'; + private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../../assets/fonts/'; public constructor(public readonly logger: DefaultLogger) { this.fonts = new Map(); const fontTimer = new Timer(); this.loadFonts().then((responseData) => { - const result: unknown[] = ['Loaded', responseData.loaded.length, 'fonts.']; + let result: string = `Loaded ${responseData.loaded.length} fonts.`; if (responseData.missingMeta.length > 0) - result.push(responseData.missingMeta.length, chalk.yellow('fonts don\'t have METADATA.pb')); - this.logger.log.info('TextManager', ...result, fontTimer.elapsedBlueStr); + result += `\n${responseData.missingMeta.length} ${chalk.yellow('fonts don\'t have METADATA.pb')}`; + this.logger.log.info('TextManager', result, fontTimer.elapsedBlueStr); if (responseData.errors > 0) this.logger.log.error('TextManager', `Encountered ${responseData.errors} errors while loading fonts`); }).catch((err) => { From 6f8667ebc6d06dffe9822ae507c47ccda47a99b9 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 18 Sep 2024 15:32:42 +0200 Subject: [PATCH 09/24] Fully added initial version of operations --- api/routes/sharp/v2/Context.ts | 93 ++++++++----------- api/routes/sharp/v2/Operation.ts | 54 ++++++----- api/routes/sharp/v2/OperationHandler.ts | 49 ++++++---- api/routes/sharp/v2/OperationSummary.ts | 57 ++++++++++++ api/routes/sharp/v2/operations/Images.ts | 0 api/routes/sharp/v2/operations/Opacity.ts | 11 ++- .../sharp/v2/operations/index.ts.disabled | 25 ----- api/routes/sharp/v2/services/ImageEditor.ts | 10 +- 8 files changed, 174 insertions(+), 125 deletions(-) create mode 100644 api/routes/sharp/v2/OperationSummary.ts create mode 100644 api/routes/sharp/v2/operations/Images.ts delete mode 100644 api/routes/sharp/v2/operations/index.ts.disabled diff --git a/api/routes/sharp/v2/Context.ts b/api/routes/sharp/v2/Context.ts index c7d80b3..fc89c4d 100644 --- a/api/routes/sharp/v2/Context.ts +++ b/api/routes/sharp/v2/Context.ts @@ -1,76 +1,63 @@ import Image from './Image.js'; -import { GenericOperation, UnknownOperation } from './Operation.js'; +import { OperationSummaryObject } from './OperationSummary.js'; +import OperationSummary from './OperationSummary.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; -export type CompletedOperation = SuccessOperation | ErrorOperation | WarningOperation; +export type CompletedOperationObject = OperationSummaryObject & { buffer?: Buffer }; +export type CompletedWithBuffer = OperationSummaryObject & { buffer: Buffer }; -export type SuccessOperation = GenericOperation & { - duration?: number; - buffer: Buffer; -}; -export type ErrorOperation = Omit & { - error: string; -}; -export type WarningOperation = SuccessOperation & { - warning: string; -}; +type CompletedWithoutBuffer = Omit; interface ContextObject { - ops: Omit[]; - warnings: Omit[]; - errors: ErrorOperation[]; + operations: CompletedWithoutBuffer[]; + warnings: CompletedWithoutBuffer[]; + errors: CompletedWithoutBuffer[] } -export default class Context { - public operations: CompletedOperation[] = []; - public constructor(public readonly logger: DefaultLogger, public readonly image: Image) { - - } - public addOperationError(operation: UnknownOperation, error: string, duration = 0): void { - this.operations.push({ - ...operation, - duration, - error - }); +export default class ImageContext { + public operations: CompletedOperationObject[] = []; + public constructor(public readonly logger: DefaultLogger, public readonly image: Image) { } - public addOperationWarning(operation: UnknownOperation, buffer: Buffer, warning: string, duration = 0): void { + // public addOperationError(operation: UnknownOperation, error: string, duration = 0): void { + // this.operations.push({ + // ...operation, + // duration, + // error + // }); + // } + + // public addOperationWarning(operation: UnknownOperation, buffer: Buffer, warning: string | string [], duration = 0): void { + // this.operations.push({ + // ...operation, + // buffer, + // duration, + // Array.isArray(warning) ? warning : warning + // }); + // } + + public addOperation(operationSummary: OperationSummary, buffer?: Buffer): void { this.operations.push({ - ...operation, - buffer, - duration, - warning + ...operationSummary.toJSON(), + buffer }); - } + }; - public addOperation(operation: UnknownOperation, buffer: Buffer, duration: number): void { - this.operations.push({ ...operation, buffer, duration }); + // Get all operations that changed the image (buffer) + public getAppliedOperations(): (CompletedWithBuffer)[] { + return this.operations.filter((e): e is CompletedWithBuffer => !e.halted && e.buffer !== undefined); } public toJSON(): ContextObject { - const warnings = this.operations.filter((e): e is WarningOperation => 'warning' in e).map((e) => { - return { - type: e.type, - data: e.data, - warning: e.warning - }; - }); - const errors = this.operations.filter((e): e is ErrorOperation => 'error' in e).map((e) => { - return { - type: e.type, - data: e.data, - error: e.error - }; - }); return { - ops: this.operations.map((e) => Object.assign({}, e, { buffer: undefined })), - warnings: warnings, - errors: errors + operations: this.operations.map((e) => this.omitBuffer(e)), + warnings: this.operations.filter((e) => e.debug.warnings.length > 0).map((e) => this.omitBuffer(e)), + errors: this.operations.filter((e) => e.halted || e.debug.errors.length > 0).map((e) => this.omitBuffer(e)) }; } - public getAppliedOperations(): (SuccessOperation)[] { - return this.operations.filter((e): e is SuccessOperation => !('error' in e)); + private omitBuffer(opObject: CompletedOperationObject): CompletedWithoutBuffer { + return Object.assign(opObject, { buffer: undefined }); } } diff --git a/api/routes/sharp/v2/Operation.ts b/api/routes/sharp/v2/Operation.ts index e4a9c8e..1af02c0 100644 --- a/api/routes/sharp/v2/Operation.ts +++ b/api/routes/sharp/v2/Operation.ts @@ -1,11 +1,14 @@ import chalk from 'chalk'; +//import { duration } from 'moment-timezone'; import Context from './Context.js'; import Image from './Image.js'; +import OperationDetails from './OperationSummary.js'; +import ImageContext from './Context.js'; +import OperationSummary from './OperationSummary.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import { mapping } from '../../../utils/mapping/index.js'; -import Timer from '../../../utils/Timer.js'; import { TypeMappingResult } from '../../../utils/types.js'; type DataMap = (value: unknown) => TypeMappingResult; @@ -23,7 +26,7 @@ interface OperationInfo { name: string; aliases?: string[]; mapping: DataMap; - execute: (image: Image, data: T) => Promise | Image; + execute: (image: Image, data: T, summary?: OperationSummary) => Promise | Image; dataPropertyAliases?: Record; } @@ -32,29 +35,24 @@ export interface GenericOperation { data: D; } -export interface UnknownOperation { - type: string; - data: unknown; -} - export default class Operation implements IOperation { public readonly name: string; public readonly aliases: string[]; public readonly dataPropertyAliases?: Record; public readonly mapping: DataMap; - #execute: (image: Image, data: OpData) => Promise | Image; + #execute: (image: Image, data: OpData, details: OperationDetails) => Promise | Image; - public constructor(public readonly logger: DefaultLogger, operation: OperationInfo) { - this.name = operation.name; - this.dataPropertyAliases = operation.dataPropertyAliases; - this.aliases = operation.aliases ?? []; + public constructor(public readonly logger: DefaultLogger, info: OperationInfo) { + this.name = info.name; + this.dataPropertyAliases = info.dataPropertyAliases; + this.aliases = info.aliases ?? []; - this.mapping = operation.mapping; - this.#execute = operation.execute; + this.mapping = info.mapping; + this.#execute = info.execute; } - private convertAliases(_: Context, data: unknown, aliases: Record | undefined): unknown { + private convertAliases(_: ImageContext, data: unknown, aliases: Record | undefined): unknown { if (aliases !== undefined) { const objectMapping = mapping.jObject(data); if (objectMapping.valid) { @@ -79,24 +77,34 @@ export default class Operation implements IOperation { } public async execute(image: Image, data: unknown): Promise { - const opTimer = new Timer(true); + const summary = new OperationSummary(this.name, data, image); + const validatedData = this.validateData(image.context, data); if (validatedData === undefined) { - image.context.addOperationError({ type: this.name, data }, 'Invalid data', 0); + this.error(summary, 'Invalid data'); return image; } try { - const imageAfter = await this.#execute(image, validatedData); + const imageAfter = await this.#execute(image, validatedData, summary); const newBuffer = await image.updateBuffer(); - image.context.addOperation({ - type: this.name, - data: validatedData - }, newBuffer, Number(opTimer.elapsedMS)); + image.context.addOperation(summary, newBuffer); + return imageAfter; } catch (err: unknown) { - this.logger.log.operation(chalk.red(`${this.name} UNCAUGHT ERROR:`), err); + this.logger.log.operation(chalk.red.bold(`${this.name}`, err)); + + this.error(summary, String(err)); return image; } } + + protected error(summary: OperationSummary, error: string, halt = true): void { + summary.addError(error); + if (halt) { + summary.halt(); + summary.image.context.addOperation(summary); + } + this.logger.log.verbose(error); + } } diff --git a/api/routes/sharp/v2/OperationHandler.ts b/api/routes/sharp/v2/OperationHandler.ts index 47fbb19..24bf85d 100644 --- a/api/routes/sharp/v2/OperationHandler.ts +++ b/api/routes/sharp/v2/OperationHandler.ts @@ -4,14 +4,14 @@ import _ from 'lodash'; import fs from 'fs'; import { fileURLToPath } from 'url'; -import Context, { SuccessOperation } from './Context.js'; +import Context, { CompletedOperationObject } from './Context.js'; import Image from './Image.js'; import Operation, { IGeneralOperation, IOperation } from './Operation.js'; import { CachedOperation } from './services/ImageEditor.js'; import { ValidInputObject } from './validateInput.js'; +import OperationSummary from './OperationSummary.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; -import { guard } from '../../../utils/guard/index.js'; interface ExportObj { default: unknown; @@ -28,27 +28,24 @@ export default class OperationHandler { public getOperation(context: Context, inputOperation: JObject): IOperation | undefined { // Maybe remove the errors from this - if (!guard.hasProperty(inputOperation, 'type') || typeof inputOperation.type !== 'string') { + if (!('type' in inputOperation) || typeof inputOperation.type !== 'string') { this.logger.log.operation(chalk.red('Invalid operation object:'), chalk.red.bold(JSON.stringify(inputOperation))); - context.addOperationError({ - type: 'unknown', - data: inputOperation - }, 'Invalid operation object'); + // Create stubby summary objecy for the invalid object + const invalidOperationSummary = this.createHaltedSummary(context, `Invalid operation object: ${JSON.stringify(inputOperation)}`); + context.addOperation(invalidOperationSummary); return; } const operation = this.operations.get(inputOperation.type); if (operation === undefined) { this.logger.log.operation(chalk.red('Invalid operation type:'), chalk.red.bold(inputOperation.type)); - context.addOperationError({ - type: inputOperation.type, - data: inputOperation - }, 'Invalid operation type', Number(inputOperation.elapsedMS)); + const invalidTypeSummary = this.createHaltedSummary(context, 'Invalid operation type', { type: inputOperation.type, data: inputOperation.data }); + context.addOperation(invalidTypeSummary); return; } return operation; } - public getBuffer(image: Image, input: ValidInputObject): { buffer: Buffer; remainingOperations: JObject[]; } | undefined { + public getCachedBuffer(image: Image, input: ValidInputObject): { buffer: Buffer; remainingOperations: JObject[]; } | undefined { if (!(input.background in this.cache)) return; let remainingOperations: JObject[] = input.operations; @@ -74,7 +71,8 @@ export default class OperationHandler { for (const cachedOperation of cachedOperations) { if (this.isEqual(validOperationObject, cachedOperation)) { - image.context.addOperation(cachedOperation, cachedOperation.buffer, 0); + const cachedSummary = new OperationSummary(cachedOperation.type, cachedOperation.data, image); + image.context.addOperation(cachedSummary, cachedOperation.buffer); currentOperation = cachedOperation; cachedUntilOperation = i + 1; this.logger.log.operation(operation.name, 'Using cache'); @@ -136,7 +134,7 @@ export default class OperationHandler { private async initOperations(): Promise { let operationCount = 0; - const operations = await this.loadOperations(this.logger); + const operations = await this.loadOperations(); for (const operationClass of operations) { const operation = new operationClass(this.logger); if (this.operations.has(operation.name)) { @@ -160,7 +158,7 @@ export default class OperationHandler { this.logger.log.operation(`Initialized ${operationCount} operations`); } - private async loadOperations(logger: DefaultLogger): Promise { + private async loadOperations(): Promise { const operations: IGeneralOperation[] = []; const operationFiles = fs.readdirSync(operationPath); @@ -171,13 +169,14 @@ export default class OperationHandler { await import(operationPath + fileName).then((contents: unknown) => { //? Check if it's an object with a 'default' property if (this.isExportObject(contents)) { - if (contents.default instanceof Operation) { + if (this.isOperation(contents)) { + this.logger.log.operation('yes'); // The infamous as unknown as 'type' moment operations.push(contents.default as unknown as IGeneralOperation); } } }).catch((err) => { - logger.log.error(err); + this.logger.log.error(err); }); } return operations; @@ -190,11 +189,23 @@ export default class OperationHandler { return false; } - private isEqual(operation: JObject | (SuccessOperation), cachedOperation: CachedOperation): boolean { + private isOperation(contents: ExportObj): boolean { + if (typeof contents.default !== 'function') + return false; + return Operation.prototype.isPrototypeOf(contents.default.prototype); + } + + private createHaltedSummary(context: Context, error: string, info?: { type?: string; data?: unknown; }): OperationSummary { + const unknownOperationSummary = new OperationSummary(info?.type ?? '', info?.data ?? undefined, context.image); + unknownOperationSummary.addError(error).halt(); + return unknownOperationSummary; + }; + + private isEqual(operation: JObject | CompletedOperationObject, cachedOperation: CachedOperation): boolean { return _.isEqual(this.removeCacheKeys(operation), this.removeCacheKeys(cachedOperation)); } - private removeCacheKeys(object: CachedOperation | JObject, include = ['type', 'data']): JObject { + private removeCacheKeys(object: JObject | CachedOperation | CompletedOperationObject, include = ['type', 'data']): JObject { return _.omit(object, Object.keys(object).filter((e) => !include.includes(e))); } } diff --git a/api/routes/sharp/v2/OperationSummary.ts b/api/routes/sharp/v2/OperationSummary.ts new file mode 100644 index 0000000..a095484 --- /dev/null +++ b/api/routes/sharp/v2/OperationSummary.ts @@ -0,0 +1,57 @@ +import Image from './Image'; + +import Timer from '../../../utils/Timer.js'; + +// The whole error state success state, error: true seems a bit tedious to me but I am just leaving it here for now due to lack of better idea +export type OperationSummaryObject = { + type: string; + data: unknown; + halted: boolean; + debug: OperationDebugObject; +}; + +export type OperationDebugObject = { + duration: number; + warnings: string[]; + errors: string[]; +}; + +// I'm not sure about the naming of this class, but oh well! +export default class OperationSummary { + private errors: string[] = []; + private warnings: string[] = []; + private halted: boolean = false; + private timer: Timer; + + public constructor(private readonly type: string, private readonly data: unknown, public readonly image: Image) { + this.timer = new Timer(true); + } + + public addError(error: string): this { + this.errors.push(error); + return this; + }; + + public addWarning(warning: string): this { + this.warnings.push(warning); + return this; + } + + public halt(): this { + this.halted = true; + return this; + } + + public toJSON(): OperationSummaryObject { + return { + type: this.type, + data: this.data, + halted: this.halted, + debug: { + errors: this.errors, + warnings: this.warnings, + duration: Number(this.timer.elapsedMS) + } + }; + }; +} diff --git a/api/routes/sharp/v2/operations/Images.ts b/api/routes/sharp/v2/operations/Images.ts new file mode 100644 index 0000000..e69de29 diff --git a/api/routes/sharp/v2/operations/Opacity.ts b/api/routes/sharp/v2/operations/Opacity.ts index 41eb9d4..9279526 100644 --- a/api/routes/sharp/v2/operations/Opacity.ts +++ b/api/routes/sharp/v2/operations/Opacity.ts @@ -14,7 +14,16 @@ export default class Opacity extends Operation { } private changeOpacity(image: Image, data: number): Image { - image.sharp.removeAlpha().ensureAlpha(data); + image.sharp.composite([{ + input: Buffer.from([0, 0, 0, Math.round(data * 255)]), + raw: { + width: 1, + height: 1, + channels: 4 + }, + tile: true, + blend: 'dest-in' + }]); return image; } } diff --git a/api/routes/sharp/v2/operations/index.ts.disabled b/api/routes/sharp/v2/operations/index.ts.disabled deleted file mode 100644 index 907f739..0000000 --- a/api/routes/sharp/v2/operations/index.ts.disabled +++ /dev/null @@ -1,25 +0,0 @@ -// feels hacky, but I don't know anything else -// import CropOperation from './Crop.js'; -// import FillOperation from './Fill.js'; -// import FlipOperation from './Flip.js'; -// import OpacityOperation from './Opacity.js'; -// import ResizeOperation from './Resize.js'; -// import RotateOperation from './Rotate.js'; -// import TextOperation from './Text.js'; - -// export type AnyOperationClass = CropOperation | OpacityOperation | FlipOperation | RotateOperation | ResizeOperation | TextOperation | FillOperation - -// export const operationObject = { -// crop: CropOperation, -// opacity: OpacityOperation, -// flip: FlipOperation, -// rotate: RotateOperation, -// resize: ResizeOperation, -// text: TextOperation, -// fill: FillOperation -// }; - -// export interface GenericOperation { -// type: T; -// data: D; -// } diff --git a/api/routes/sharp/v2/services/ImageEditor.ts b/api/routes/sharp/v2/services/ImageEditor.ts index d9f5520..9578ba3 100644 --- a/api/routes/sharp/v2/services/ImageEditor.ts +++ b/api/routes/sharp/v2/services/ImageEditor.ts @@ -4,12 +4,13 @@ import ImageFetcher from './ImageFetcher.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; -import { SuccessOperation } from '../Context.js'; import Image from '../Image.js'; import OperationHandler from '../OperationHandler.js'; import { validateRootInput } from '../validateInput.js'; +import { CompletedOperationObject } from '../Context.js'; -export type CachedOperation = (SuccessOperation) & { +export type CachedOperation = (CompletedOperationObject) & { + buffer: Buffer; nextOperations?: CachedOperation[]; }; @@ -33,11 +34,12 @@ export class ImageEditor { return new Image(this.logger, this.fetcher.defaultImageBuffer, 'invalid'); // TODO HANDLE INVALID BACKGROUND const image = new Image(this.logger, imageBuffer, validatedInput.background); - // Caching vars - const operationCache = this.operationHandler.getBuffer(image, validatedInput); + // Use the cache of any operation that is already cached + const operationCache = this.operationHandler.getCachedBuffer(image, validatedInput); if (operationCache !== undefined) image.setBuffer(operationCache.buffer); + // Execute operations that are not cached for (const inputObj of operationCache !== undefined ? operationCache.remainingOperations : validatedInput.operations) { const opTimer = new Timer(true); const operation = this.operationHandler.getOperation(image.context, inputObj); From 549a4b9ca077de25e27b5cf7747303b61da20ba3 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 18 Sep 2024 15:36:48 +0200 Subject: [PATCH 10/24] Change config type to node Fixes warning in vscode --- .vscode/launch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8d648c5..7c2ecc2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "configurations": [ { - "type": "pwa-node", + "type": "node", "request": "launch", "name": "Debug main", "skipFiles": [ From 17e86f3603d1d2641a17ed9f30d0eefc39adbc6e Mon Sep 17 00:00:00 2001 From: RagingLink Date: Sat, 21 Sep 2024 15:22:40 +0200 Subject: [PATCH 11/24] Change file structure and fixed linting * Also improved typebox schemas by using TypeCompiler * --- .vscode/settings.json | 4 +- api/api.ts | 47 ---- api/eslint.config.mjs | 18 +- api/eslint.tsconfig.json | 12 + api/package.json | 17 +- api/routes/sharp/v2/Operation.ts | 110 -------- api/routes/sharp/v2/operations/Text.ts | 246 ----------------- api/routes/sharp/v2/validateInput.ts | 84 ------ api/src/api.ts | 53 ++++ api/{ => src}/modules/text2png.ts.disabled | 0 api/{ => src}/routes/ProgressbarRoute.ts | 2 +- api/{ => src}/routes/TimezonesRoute.ts | 37 ++- api/{ => src}/routes/sharp/Prisma.ts | 2 +- api/{ => src}/routes/sharp/SharpDiscord.ts | 9 +- .../routes/sharp/managers/TextManager.ts | 0 api/{ => src}/routes/sharp/replaceColor.ts | 0 .../routes/sharp/replaceColorWorker.ts | 0 api/{ => src}/routes/sharp/v1/SharpRoute.ts | 9 +- .../routes/sharp/v1/managers/Image.ts | 2 +- .../routes/sharp/v1/managers/ImageEditor.ts | 6 +- .../routes/sharp/v1/managers/ImageFetcher.ts | 2 +- .../routes/sharp/v1/managers/ImageManager.ts | 28 +- .../routes/sharp/v1/managers/TextManager.ts | 2 +- .../routes/sharp/v1/mapBody/bodyMappings.ts | 2 +- .../routes/sharp/v1/mapBody/index.ts | 3 +- .../v1/mapBody}/mapping/createMapping.ts | 0 .../routes/sharp/v1/mapBody}/mapping/index.ts | 0 .../sharp/v1/mapBody}/mapping/mapArray.ts | 0 .../sharp/v1/mapBody}/mapping/mapBase64.ts | 0 .../sharp/v1/mapBody}/mapping/mapBigInt.ts | 0 .../sharp/v1/mapBody}/mapping/mapBoolean.ts | 0 .../sharp/v1/mapBody}/mapping/mapChoice.ts | 0 .../sharp/v1/mapBody}/mapping/mapDate.ts | 0 .../sharp/v1/mapBody}/mapping/mapDuration.ts | 0 .../sharp/v1/mapBody}/mapping/mapFake.ts | 0 .../sharp/v1/mapBody}/mapping/mapGuard.ts | 0 .../routes/sharp/v1/mapBody}/mapping/mapIn.ts | 0 .../v1/mapBody}/mapping/mapInstanceof.ts | 0 .../sharp/v1/mapBody}/mapping/mapJObject.ts | 0 .../sharp/v1/mapBody}/mapping/mapJToken.ts | 0 .../sharp/v1/mapBody}/mapping/mapJson.ts | 0 .../sharp/v1/mapBody}/mapping/mapNumber.ts | 0 .../sharp/v1/mapBody}/mapping/mapObject.ts | 0 .../sharp/v1/mapBody}/mapping/mapRecord.ts | 0 .../sharp/v1/mapBody}/mapping/mapRegex.ts | 0 .../sharp/v1/mapBody}/mapping/mapString.ts | 0 .../sharp/v1/mapBody}/mapping/mapTuple.ts | 0 .../sharp/v1/mapBody}/mapping/mapTypeof.ts | 0 .../sharp/v1/mapBody}/mapping/mapUnknown.ts | 0 .../sharp/v1/mapBody}/mapping/result.ts | 0 .../routes/sharp/v1/mapBody}/mapping/types.ts | 0 api/{ => src}/routes/sharp/v2/Context.ts | 41 ++- api/{ => src}/routes/sharp/v2/Image.ts | 29 +- api/src/routes/sharp/v2/Operation.ts | 122 +++++++++ .../routes/sharp/v2/OperationSummary.ts | 2 +- .../routes/sharp/v2/Operations.ts.disabled | 0 api/{ => src}/routes/sharp/v2/SharpRoute.ts | 0 .../routes/sharp/v2/operations/Crop.ts | 26 +- .../routes/sharp/v2/operations/Fill.ts | 8 +- .../routes/sharp/v2/operations/Flip.ts | 9 +- .../routes/sharp/v2/operations/Images.ts | 0 .../routes/sharp/v2/operations/Opacity.ts | 9 +- .../sharp/v2/operations/ReplaceColor.ts | 5 + .../routes/sharp/v2/operations/Resize.ts | 25 +- .../routes/sharp/v2/operations/Rotate.ts | 10 +- api/src/routes/sharp/v2/operations/Text.ts | 257 ++++++++++++++++++ .../routes/sharp/v2/services/ImageEditor.ts | 41 ++- .../routes/sharp/v2/services/ImageFetcher.ts | 2 +- .../routes/sharp/v2/services/ImageManager.ts | 0 .../sharp/v2/services}/OperationHandler.ts | 108 ++++---- .../routes/sharp/v2/services/TextManager.ts | 0 api/src/routes/sharp/v2/validateInput.ts | 95 +++++++ api/src/types/Config.ts | 13 + api/{ => src}/types/ImageTypes.ts | 0 api/{ => src}/types/PayloadTypes.ts | 0 api/{ => src}/types/definitions/global.d.ts | 0 api/{ => src}/utils/CacheManager.ts | 0 api/{ => src}/utils/HttpException.ts | 0 api/{ => src}/utils/Timer.ts | 5 + api/{ => src}/utils/env/createEnv.ts | 0 api/{ => src}/utils/env/validateEnv.ts | 0 api/{ => src}/utils/guard/hasProperty.ts | 0 api/{ => src}/utils/guard/hasValue.ts | 0 api/{ => src}/utils/guard/index.ts | 0 api/{ => src}/utils/index.ts | 2 +- api/src/utils/loadConfig.ts | 29 ++ api/{ => src}/utils/logging/NiceLogger.ts | 0 api/{ => src}/utils/logging/WinstonLogger.ts | 0 api/{ => src}/utils/types.ts | 0 api/tsconfig.json | 20 +- api/types/Config.ts | 13 - api/types/index.ts | 3 - api/yarn.lock | 137 +++++----- 93 files changed, 958 insertions(+), 748 deletions(-) delete mode 100644 api/api.ts create mode 100644 api/eslint.tsconfig.json delete mode 100644 api/routes/sharp/v2/Operation.ts delete mode 100644 api/routes/sharp/v2/operations/Text.ts delete mode 100644 api/routes/sharp/v2/validateInput.ts create mode 100644 api/src/api.ts rename api/{ => src}/modules/text2png.ts.disabled (100%) rename api/{ => src}/routes/ProgressbarRoute.ts (98%) rename api/{ => src}/routes/TimezonesRoute.ts (55%) rename api/{ => src}/routes/sharp/Prisma.ts (85%) rename api/{ => src}/routes/sharp/SharpDiscord.ts (80%) rename api/{ => src}/routes/sharp/managers/TextManager.ts (100%) rename api/{ => src}/routes/sharp/replaceColor.ts (100%) rename api/{ => src}/routes/sharp/replaceColorWorker.ts (100%) rename api/{ => src}/routes/sharp/v1/SharpRoute.ts (96%) rename api/{ => src}/routes/sharp/v1/managers/Image.ts (99%) rename api/{ => src}/routes/sharp/v1/managers/ImageEditor.ts (98%) rename api/{ => src}/routes/sharp/v1/managers/ImageFetcher.ts (97%) rename api/{ => src}/routes/sharp/v1/managers/ImageManager.ts (88%) rename api/{ => src}/routes/sharp/v1/managers/TextManager.ts (99%) rename api/{ => src}/routes/sharp/v1/mapBody/bodyMappings.ts (97%) rename api/{ => src}/routes/sharp/v1/mapBody/index.ts (98%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/createMapping.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/index.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapArray.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapBase64.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapBigInt.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapBoolean.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapChoice.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapDate.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapDuration.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapFake.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapGuard.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapIn.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapInstanceof.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapJObject.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapJToken.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapJson.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapNumber.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapObject.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapRecord.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapRegex.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapString.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapTuple.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapTypeof.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/mapUnknown.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/result.ts (100%) rename api/{utils => src/routes/sharp/v1/mapBody}/mapping/types.ts (100%) rename api/{ => src}/routes/sharp/v2/Context.ts (61%) rename api/{ => src}/routes/sharp/v2/Image.ts (75%) create mode 100644 api/src/routes/sharp/v2/Operation.ts rename api/{ => src}/routes/sharp/v2/OperationSummary.ts (97%) rename api/{ => src}/routes/sharp/v2/Operations.ts.disabled (100%) rename api/{ => src}/routes/sharp/v2/SharpRoute.ts (100%) rename api/{ => src}/routes/sharp/v2/operations/Crop.ts (64%) rename api/{ => src}/routes/sharp/v2/operations/Fill.ts (79%) rename api/{ => src}/routes/sharp/v2/operations/Flip.ts (75%) rename api/{ => src}/routes/sharp/v2/operations/Images.ts (100%) rename api/{ => src}/routes/sharp/v2/operations/Opacity.ts (77%) create mode 100644 api/src/routes/sharp/v2/operations/ReplaceColor.ts rename api/{ => src}/routes/sharp/v2/operations/Resize.ts (52%) rename api/{ => src}/routes/sharp/v2/operations/Rotate.ts (66%) create mode 100644 api/src/routes/sharp/v2/operations/Text.ts rename api/{ => src}/routes/sharp/v2/services/ImageEditor.ts (52%) rename api/{ => src}/routes/sharp/v2/services/ImageFetcher.ts (93%) rename api/{ => src}/routes/sharp/v2/services/ImageManager.ts (100%) rename api/{routes/sharp/v2 => src/routes/sharp/v2/services}/OperationHandler.ts (68%) rename api/{ => src}/routes/sharp/v2/services/TextManager.ts (100%) create mode 100644 api/src/routes/sharp/v2/validateInput.ts create mode 100644 api/src/types/Config.ts rename api/{ => src}/types/ImageTypes.ts (100%) rename api/{ => src}/types/PayloadTypes.ts (100%) rename api/{ => src}/types/definitions/global.d.ts (100%) rename api/{ => src}/utils/CacheManager.ts (100%) rename api/{ => src}/utils/HttpException.ts (100%) rename api/{ => src}/utils/Timer.ts (93%) rename api/{ => src}/utils/env/createEnv.ts (100%) rename api/{ => src}/utils/env/validateEnv.ts (100%) rename api/{ => src}/utils/guard/hasProperty.ts (100%) rename api/{ => src}/utils/guard/hasValue.ts (100%) rename api/{ => src}/utils/guard/index.ts (100%) rename api/{ => src}/utils/index.ts (69%) create mode 100644 api/src/utils/loadConfig.ts rename api/{ => src}/utils/logging/NiceLogger.ts (100%) rename api/{ => src}/utils/logging/WinstonLogger.ts (100%) rename api/{ => src}/utils/types.ts (100%) delete mode 100644 api/types/Config.ts delete mode 100644 api/types/index.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index 9120064..18b9b68 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,6 @@ { "files.exclude": { - "**/*.js": { - "when": "$(basename).ts" - }, + "**/out": true, "**/*.js.map": true, "**/node_modules": true }, diff --git a/api/api.ts b/api/api.ts deleted file mode 100644 index e7bb6b0..0000000 --- a/api/api.ts +++ /dev/null @@ -1,47 +0,0 @@ -import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; - -import http from 'http'; - -import ProgressBarRoute from './routes/ProgressbarRoute.js'; -//import SharpRoute from './routes/sharp/v1/SharpRoute.js'; -import SharpRouteV2 from './routes/sharp/v2/SharpRoute.js'; -import TimezonesRoute from './routes/TimezonesRoute.js'; -import env from './utils/env/createEnv.js'; -import HttpException from './utils/HttpException.js'; -import { defaultLogLevels, NiceLogger } from './utils/logging/NiceLogger.js'; - -const logger = new NiceLogger({ levels: defaultLogLevels, defaultLevel: 'verbose' }); -const app = express(); -app.get('/', (_, res) => { - res.redirect('https://api.nicelink.xyz/docs'); -}); -const server = http.createServer(app); - -app.set('trust proxy', 1); - -app.use(urlencoded({ extended: false })); -app.use(json({ strict: false })); - -//const sharpRoute = new SharpRoute(logger, env); -const sharpRouteV2 = new SharpRouteV2(logger); -//* Alias -app.use('/sharp/v2', sharpRouteV2.router); -//app.use('/sharp/v1', sharpRoute.router); -//app.use('/jimp', sharpRoute.router); - -app.use('/misc/progressbar', new ProgressBarRoute(logger).router); -app.use('/timezones', new TimezonesRoute().router); - -app.use((err: HttpException, _: Request, res: Response, next: NextFunction): void => { - if (err.status === 400 && 'body' in err) { - if (err instanceof SyntaxError) { - logger.log.error('API', `${err.name}: ${err.message}`); - } else - logger.log.error('error', err); - return void res.status(400).send({ status: 400, message: err.message }); - } - next(); -}); -server.listen(env.PORT, () => { - logger.log.info('API', 'Listening on port', +(env.PORT ?? '')); -}); diff --git a/api/eslint.config.mjs b/api/eslint.config.mjs index 8019988..67a867a 100644 --- a/api/eslint.config.mjs +++ b/api/eslint.config.mjs @@ -8,8 +8,8 @@ import importPluginX from 'eslint-plugin-import-x'; export default tseslint.config( { - files: ['**/*.ts', '**/*.tsx', 'eslint.config.mjs'], - ignores: ['**/*.js', '**/*.jsx', 'node_modules'], + files: ['src/**/*.ts', 'eslint.config.mjs'], + ignores: ['**/*.js', 'out/**/*.js', 'node_modules'], plugins: { '@typescript-eslint': tseslintPlugin, '@stylistic': stylistic, @@ -19,9 +19,11 @@ export default tseslint.config( languageOptions: { parser: tsParser, parserOptions: { - project: './tsconfig.json', - tsconfigRootDir: import.meta.dirname - } + project: './eslint.tsconfig.json', + tsconfigRootDir: import.meta.dirname, + warnOnUnsupportedTypeScriptVersion: false + }, + ecmaVersion: 'latest' }, rules: { ...tseslint.configs.recommended.rules, @@ -59,6 +61,9 @@ export default tseslint.config( } ], 'import-x/newline-after-import': 'warn', + 'import-x/extensions': ['error', 'always', { + ignorePackages: true + }], 'sort-imports': ['error', { 'ignoreCase': true, 'ignoreDeclarationSort': true @@ -111,7 +116,8 @@ export default tseslint.config( }], '@stylistic/semi': [2, 'always'], - + '@stylistic/semi-spacing': 'error', + '@stylistic/no-whitespace-before-property': 'error', //Typescript '@typescript-eslint/explicit-member-accessibility': 'error', '@typescript-eslint/class-literal-property-style': 'error', diff --git a/api/eslint.tsconfig.json b/api/eslint.tsconfig.json new file mode 100644 index 0000000..6d69637 --- /dev/null +++ b/api/eslint.tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "types": ["@types/node"], + "noEmit": true, + "allowJs": true + }, + "include": [ + "src/**/*.ts", + "eslint.config.mjs" + ] +} \ No newline at end of file diff --git a/api/package.json b/api/package.json index 09f4921..baacd51 100644 --- a/api/package.json +++ b/api/package.json @@ -3,15 +3,15 @@ "version": "1.1.1", "description": "Api for api.nicelink.xyz", "engines": { - "node": ">=14.6" + "node": ">=20.0" }, "scripts": { - "start": "node --experimental-json-modules api.js ", + "start": "node out/api.js ", "migrate": "npx prisma migrate dev", "generate": "npx prisma generate", "dbpush": "npx prisma db push", "setupPrisma": "yarn run migrate && yarn run dbpush", - "clean": "del-cli \"**/*.js\" \"**/*.js.map\" \"**/*.mjs\" \"**/*.mjs.map\" \"**/*.cjs\" \"**/*.cjs.map\" \"!node_modules\"", + "clean": "del-cli \"./out\"", "build": "tsc", "watch": "tsc --watch", "rebuild": "yarn run clean && yarn run build", @@ -21,19 +21,20 @@ }, "dependencies": { "@prisma/client": "^5.10.2", + "@sinclair/typebox": "^0.33.12", "buffer-image-size": "^0.6.4", "canvas": "2.11.2", "cat-loggr": "^1.2.2", "chalk": "^5.1.2", "color": "^4.2.3", - "config": "^3.3.8", + "config": "^3.3.12", "dayjs": "^1.11.6", "delta-e": "^0.0.8", "dotenv": "^16.0.3", "emoji-regex": "^10.2.1", "envalid": "^7.3.1", "eris": "^0.17.1", - "express": "^4.18.2", + "express": "^4.21.0", "fastify": "^4.23.2", "file-type": "^18.0.0", "lodash": "^4.17.21", @@ -67,7 +68,7 @@ "@types/chalk": "^2.2.0", "@types/color": "^3.0.3", "@types/color-convert": "^2.0.0", - "@types/config": "^3.3.0", + "@types/config": "^3.3.5", "@types/delta-e": "^0.0.2", "@types/express": "^4.17.13", "@types/lodash": "^4.14.199", @@ -81,11 +82,11 @@ "@types/ws": "^8.5.4", "@typescript-eslint/eslint-plugin": "^8.6.0", "@typescript-eslint/parser": "^8.6.0", - "del-cli": "^5.0.0", + "del-cli": "^5.1.0", "eslint": "^9.0.0", "eslint-plugin-import-x": "^4.2.1", "prisma": "^5.10.2", - "typescript": "^5.4.0", + "typescript": "^5.6.2", "typescript-eslint": "^8.6.0" }, "type": "module" diff --git a/api/routes/sharp/v2/Operation.ts b/api/routes/sharp/v2/Operation.ts deleted file mode 100644 index 1af02c0..0000000 --- a/api/routes/sharp/v2/Operation.ts +++ /dev/null @@ -1,110 +0,0 @@ -import chalk from 'chalk'; -//import { duration } from 'moment-timezone'; - -import Context from './Context.js'; -import Image from './Image.js'; -import OperationDetails from './OperationSummary.js'; -import ImageContext from './Context.js'; -import OperationSummary from './OperationSummary.js'; - -import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../utils/mapping/index.js'; -import { TypeMappingResult } from '../../../utils/types.js'; - -type DataMap = (value: unknown) => TypeMappingResult; - -export type IGeneralOperation = new (logger: DefaultLogger) => IOperation; - -export interface IOperation { - name: string; - aliases: string[]; - execute: (image: Image, data: unknown) => Promise; - validateData: (ctx: Context, data: unknown) => unknown; -} - -interface OperationInfo { - name: string; - aliases?: string[]; - mapping: DataMap; - execute: (image: Image, data: T, summary?: OperationSummary) => Promise | Image; - dataPropertyAliases?: Record; -} - -export interface GenericOperation { - type: T; - data: D; -} - -export default class Operation implements IOperation { - public readonly name: string; - public readonly aliases: string[]; - public readonly dataPropertyAliases?: Record; - public readonly mapping: DataMap; - - #execute: (image: Image, data: OpData, details: OperationDetails) => Promise | Image; - - public constructor(public readonly logger: DefaultLogger, info: OperationInfo) { - this.name = info.name; - this.dataPropertyAliases = info.dataPropertyAliases; - this.aliases = info.aliases ?? []; - - this.mapping = info.mapping; - this.#execute = info.execute; - } - - private convertAliases(_: ImageContext, data: unknown, aliases: Record | undefined): unknown { - if (aliases !== undefined) { - const objectMapping = mapping.jObject(data); - if (objectMapping.valid) { - for (const key of Object.keys(objectMapping.value)) { - if (key in aliases) { - objectMapping.value[aliases[key]] = objectMapping.value[key]; - delete objectMapping.value[key]; - } - } - return objectMapping.value; - } - } - return data; - } - - public validateData(_: Context, data: unknown): OpData | void { - const validatedData = this.mapping(this.convertAliases(_, data, this.dataPropertyAliases)); - - if (!validatedData.valid) - return; - return validatedData.value; - } - - public async execute(image: Image, data: unknown): Promise { - const summary = new OperationSummary(this.name, data, image); - - const validatedData = this.validateData(image.context, data); - if (validatedData === undefined) { - this.error(summary, 'Invalid data'); - return image; - } - - try { - const imageAfter = await this.#execute(image, validatedData, summary); - const newBuffer = await image.updateBuffer(); - image.context.addOperation(summary, newBuffer); - - return imageAfter; - } catch (err: unknown) { - this.logger.log.operation(chalk.red.bold(`${this.name}`, err)); - - this.error(summary, String(err)); - return image; - } - } - - protected error(summary: OperationSummary, error: string, halt = true): void { - summary.addError(error); - if (halt) { - summary.halt(); - summary.image.context.addOperation(summary); - } - this.logger.log.verbose(error); - } -} diff --git a/api/routes/sharp/v2/operations/Text.ts b/api/routes/sharp/v2/operations/Text.ts deleted file mode 100644 index 8b26050..0000000 --- a/api/routes/sharp/v2/operations/Text.ts +++ /dev/null @@ -1,246 +0,0 @@ -import sizeOf from 'buffer-image-size'; -import _ from 'lodash'; - -import { AlignmentModes, InputOptions } from '../../../../types/PayloadTypes.js'; -import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../../utils/mapping/index.js'; -import Timer from '../../../../utils/Timer.js'; -import Image from '../Image.js'; -import Operation from '../Operation.js'; -import { TextManager } from '../services/TextManager.js'; - -interface SizeObject { - width: number; - height: number; -} -interface Coords { - x: number; - y: number; -} - -const textOptions = mapping.object({ - text: mapping.string.optional, - size: mapping.string.optional, - font: mapping.string.optional, - textAlign: mapping.in('left', 'center', 'right').optional, - color: mapping.string.optional, - textColor: mapping.string.optional, - backgroundColor: mapping.string.optional, - bgColor: mapping.string.optional, - lineSpacing: mapping.number.optional, - maxWidth: mapping.number.optional, - strokeWidth: mapping.number.optional, - strokeColor: mapping.string.optional, - padding: mapping.number.optional, - paddingLeft: mapping.number.optional, - paddingRight: mapping.number.optional, - paddingTop: mapping.number.optional, - paddingBottom: mapping.number.optional, - borderWidth: mapping.number.optional, - borderLeftWidth: mapping.number.optional, - borderRightWidth: mapping.number.optional, - borderBottomWidth: mapping.number.optional, - borderTopWidth: mapping.number.optional, - borderColor: mapping.string.optional, - localFontPath: mapping.string.optional, - localFontName: mapping.string.optional, - output: mapping.in('buffer', 'stream', 'dataURL', 'canvas').optional -}); -export const textMapping = { - x: mapping.number.optional, - y: mapping.number.optional, - alignment: mapping.in('top-left', 'top-middle', 'top-right', 'left', 'center', 'right', 'bot-left', 'bot-middle', 'bot-right').optional, - options: textOptions -}; - -interface TextOperationData { - options: InputOptions; - x?: number; - y?: number; - alignment?: AlignmentModes; -} - -interface CachedText { - input: InputOptions; - buffer: Buffer; - maxWidth: number; - width: number; - height: number; - fit?: ResizedToFitData; -} - -interface ResizedToFitData { - buffer: Buffer; - maxWidth: number; - left: number; - top: number; -} - -export default class Text extends Operation { - private readonly manager: TextManager; - private readonly cache: Record = {}; - public constructor(public readonly logger: DefaultLogger) { - super(logger, { - name: 'text', - mapping: mapping.array(mapping.object({ ...textMapping })), - dataPropertyAliases: { - 'p': 'position', - 'pos': 'position', - 'o': 'options', - 'ops': 'options', - 'options[].color': 'textColor', - 'options[].bgColor': 'backgroundColor' - }, - execute: (image, data) => this.addTextImages(image, data) - }); - this.manager = new TextManager(logger); - } - - private async addTextImages(image: Image, textObjects: TextOperationData[]): Promise { - const textArray: { buffer: Buffer; data: TextOperationData; }[] = []; - for (const textObject of textObjects) { - const options = textObject.options; - const text = options.text ?? ''; - const maxWidth = options.maxWidth ?? image.width; - - this.logger.log.operation(options); - - const textPngTimer = new Timer(true); - let textBuffer: Buffer | undefined; - if (text in this.cache) { - for (const cachedText of this.cache[text]) { - if (cachedText.maxWidth >= maxWidth && cachedText.width <= maxWidth) { - if (_.isEqual(cachedText.input, options)) { - textBuffer = cachedText.buffer; - break; - } - } - } - } - if (textBuffer === undefined) { - textBuffer = this.manager.text2png(text, { ...options, maxWidth }); - if (!(text in this.cache)) - this.cache[text] = []; - const { width, height } = sizeOf(textBuffer); - - this.cache[text].push({ - input: options, - buffer: textBuffer, - maxWidth, - width, - height - }); - - } - this.logger.log.time('Text2Png', textPngTimer.elapsedBlueStr); - textArray.push({ - buffer: textBuffer, - data: textObject - }); - - } - const compositeOptions = await Promise.all(textArray.map(async (text) => { - const overlayOption = { - input: text.buffer, - left: 0, - top: 0 - }; - const { width, height } = sizeOf(text.buffer); - const alignCoords = this.getAlignCoords(image, { width, height }, text.data.alignment ?? 'top-left'); - const coords = { x: text.data.x ?? 0, y: text.data.y ?? 0 }; - const [leftOffset, topOffset] = [alignCoords.x + coords.x, alignCoords.y + coords.y]; - const parentDimensions = { width: image.width, height: image.height }; - const textDimensions = { width, height }; - - if (!this.canImageFit(parentDimensions, textDimensions)) { - this.logger.log.operation('Text', 'Cannot fit'); - overlayOption.input = await this.fitImage(parentDimensions, new Image(this.logger, text.buffer, ''), coords, alignCoords).sharp.toBuffer(); - - // If the offset is set outside the image, that region will be cropped out already so it shouldn't be offset. - if (leftOffset > 0) - overlayOption.left += leftOffset; - if (topOffset > 0) - overlayOption.top += topOffset; - } else { - overlayOption.left = leftOffset; - overlayOption.top = topOffset; - } - this.logger.log.operation(overlayOption); - return overlayOption; - })); - - image.sharp.composite(compositeOptions); - return image; - } - - private getAlignCoords(parentImage: Image, childSize: SizeObject, alignment: AlignmentModes): Coords { - const alignCoords = { - x: 0, - y: 0 - }; - switch (alignment) { - case 'top-left': - break; - case 'top-middle': - alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); - break; - case 'top-right': - alignCoords.x = parentImage.width - childSize.width; - break; - case 'left': - alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); - break; - case 'center': - alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); - alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); - break; - case 'right': - alignCoords.x = parentImage.width - childSize.width; - alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); - break; - case 'bot-left': - alignCoords.y = parentImage.height - childSize.height; - break; - case 'bot-middle': - alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); - alignCoords.y = parentImage.height - childSize.height; - break; - case 'bot-right': - alignCoords.x = parentImage.width - childSize.width; - alignCoords.y = parentImage.height - childSize.height; - break; - } - return alignCoords; - } - - //can fit without the child image being outside the parent in any way - private canImageFit(parentDimensions: SizeObject, childDimensions: SizeObject): boolean { - if (childDimensions.width > parentDimensions.width) - return false; - if (childDimensions.height > parentDimensions.height) - return false; - return true; - } - - private fitImage(fitDimensions: SizeObject, image: Image, offset: Coords, alignOffset: Coords): Image { - const [left, top] = [alignOffset.x + offset.x, alignOffset.y + offset.y]; - const cropRegion = { - width: image.width, - height: image.height, - left: 0, - top: 0 - }; - if (image.width > fitDimensions.width) { - cropRegion.width = Math.min(fitDimensions.width, image.width - Math.abs(left)); - if (left < 0) - cropRegion.left = -left; - } - if (image.height > fitDimensions.height) { - cropRegion.height = Math.min(fitDimensions.height, image.height - Math.abs(top)); - if (top < 0) - cropRegion.top = -top; - } - image.sharp.extract(cropRegion); - return image; - } -} diff --git a/api/routes/sharp/v2/validateInput.ts b/api/routes/sharp/v2/validateInput.ts deleted file mode 100644 index f6a55ae..0000000 --- a/api/routes/sharp/v2/validateInput.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { guard } from '../../../utils/guard/index.js'; -import { mapping } from '../../../utils/mapping/index.js'; - -export interface ValidInputObject { - background: string; - cacheDuration?: number; - operations: JObject[]; -} - -// Aliases on base object or -const propertyAliases = { - bg: 'background', - h: 'height', - w: 'width', - t: 'type', - d: 'data', - // txt: 'text', - // o: 'opacity', - // r: 'rotate', - // s: 'shape', - align: 'alignment', - // children: 'images', - ops: 'operations' -}; - -/* const imageMapping = mapping.object({ - background: mapping.string.optional, - x: mapping.number.optional, - y: mapping.number.optional, - alignment: mapping.string.optional, - size: mapping.string.optional, - blendMode: mapping.string.optional -}); */ - -const inputObjectMapping = mapping.object({ - background: mapping.string.optional, - cacheDuration: mapping.number.optional, - responseType: mapping.string.optional, - operations: mapping.array(mapping.unknown).optional -}); - -export function validateRootInput(input: JObject): ValidInputObject | undefined { - convertAliases(input); - const mappedInputObject = inputObjectMapping(input); - if (!mappedInputObject.valid) - return; - - const rootImageInput = mappedInputObject.value; - - const operations = []; - - if (guard.hasProperty(rootImageInput, 'operations') && Array.isArray(rootImageInput.operations)) { - for (const element of rootImageInput.operations) { - const mappedOperation = mapping.jObject(element); - if (!mappedOperation.valid) - operations.push(generateInvalidOperation(element)); - else - operations.push(convertAliases(mappedOperation.value)); - } - } - return { background: rootImageInput.background ?? '', operations }; -} - -function convertAliases(input: JObject): JObject { - for (const key of Object.keys(input)) - if (guard.hasProperty(propertyAliases, key)) { - input[propertyAliases[key]] = input[key]; - delete input[key]; - } - return input; -} - -function generateInvalidOperation(operation: unknown): JObject { - const mappedJtoken = mapping.jToken(operation); - if (mappedJtoken.valid) - return { - type: 'invalid_operation', - data: mappedJtoken.value - }; - return { - type: 'invalid_operation', - data: 'undefined' - }; -} diff --git a/api/src/api.ts b/api/src/api.ts new file mode 100644 index 0000000..70fdd49 --- /dev/null +++ b/api/src/api.ts @@ -0,0 +1,53 @@ +import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; + +import http from 'http'; + +import ProgressBarRoute from './routes/ProgressbarRoute.js'; +import SharpRoute from './routes/sharp/v1/SharpRoute.js'; +import SharpRouteV2 from './routes/sharp/v2/SharpRoute.js'; +import TimezonesRoute from './routes/TimezonesRoute.js'; +import env from './utils/env/createEnv.js'; +import HttpException from './utils/HttpException.js'; +import { defaultLogLevels, NiceLogger } from './utils/logging/NiceLogger.js'; +import loadConfig from './utils/loadConfig.js'; + +// Maybe I should make API its own class so I can more 'cleanly' expose common properties like config/env etc by just passing API to each route/module +const logger = new NiceLogger({ levels: defaultLogLevels, defaultLevel: 'verbose' }); +const app = express(); + +loadConfig().then((config) => { + app.get('/', (_, res) => { + res.redirect('https://api.nicelink.xyz/docs'); + }); + app.set('trust proxy', 1); + + app.use(urlencoded({ extended: false })); + app.use(json({ strict: false })); + + const sharpRoute = new SharpRoute(logger, env, config); + const sharpRouteV2 = new SharpRouteV2(logger); + //* Alias + app.use('/sharp/v2', sharpRouteV2.router); + app.use('/sharp/v1', sharpRoute.router); + //app.use('/jimp', sharpRoute.router); + + app.use('/misc/progressbar', new ProgressBarRoute(logger).router); + app.use('/timezones', new TimezonesRoute().router); + + app.use((err: HttpException, _: Request, res: Response, next: NextFunction): void => { + if (err.status === 400 && 'body' in err) { + if (err instanceof SyntaxError) { + logger.log.error('API', `${err.name}: ${err.message}`); + } else + logger.log.error('error', err); + return void res.status(400).send({ status: 400, message: err.message }); + } + next(); + }); +}); + +const server = http.createServer(app); + +server.listen(env.PORT, () => { + logger.log.info('API', 'Listening on port', +(env.PORT ?? '')); +}); diff --git a/api/modules/text2png.ts.disabled b/api/src/modules/text2png.ts.disabled similarity index 100% rename from api/modules/text2png.ts.disabled rename to api/src/modules/text2png.ts.disabled diff --git a/api/routes/ProgressbarRoute.ts b/api/src/routes/ProgressbarRoute.ts similarity index 98% rename from api/routes/ProgressbarRoute.ts rename to api/src/routes/ProgressbarRoute.ts index de58097..82392de 100644 --- a/api/routes/ProgressbarRoute.ts +++ b/api/src/routes/ProgressbarRoute.ts @@ -11,7 +11,7 @@ import { DefaultLogger } from '../utils/logging/NiceLogger.js'; export default class ProgressBarRoute { public router = Router(); - #assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', 'assets', 'img'); + #assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', 'assets', 'img'); private readonly pillBg = fs.readFileSync(this.#assetsPath + '/1000x64_pillshape.png'); private readonly pillShape = fs.readFileSync(this.#assetsPath + '/996x60_pillshape.png'); private readonly cache: CacheManager<{ buffer: Buffer; }>; diff --git a/api/routes/TimezonesRoute.ts b/api/src/routes/TimezonesRoute.ts similarity index 55% rename from api/routes/TimezonesRoute.ts rename to api/src/routes/TimezonesRoute.ts index bcfa01e..55c2093 100644 --- a/api/routes/TimezonesRoute.ts +++ b/api/src/routes/TimezonesRoute.ts @@ -1,17 +1,34 @@ import { Request, Response, Router } from 'express'; +import { Static, Type } from '@sinclair/typebox'; +import { Value } from '@sinclair/typebox/value'; -import timezones from '../assets/data/timezones.json' assert {type: 'json'}; +const singleTimezoneSchema = Type.Object({ + value: Type.String(), + abbr: Type.String(), + offset: Type.Number(), + isdst: Type.Boolean(), + text: Type.String(), + utc: Type.Array(Type.String()) +}); +const timezonesArraySchema = Type.Array(singleTimezoneSchema); export default class TimezonesRoute { public readonly router = Router(); - private readonly simpleTimezones: string[]; + private simpleTimezones: string[] = []; + + #timezones: Static = []; public constructor() { - this.simpleTimezones = timezones - .reduce((acc: string[], item) => { - acc.push(...item.utc); - return acc; - }, []).filter((item, index, self) => self.indexOf(item) === index); + import('../../assets/data/timezones.json', { with: { type: 'json' } }).then((data) => { + if(!Value.Check(timezonesArraySchema, data)) + return; + this.#timezones = data; + this.simpleTimezones = this.#timezones + .reduce((acc: string[], item) => { + acc.push(...item.utc); + return acc; + }, []).filter((item, index, self) => self.indexOf(item) === index); + }); this.router.get('/', (req, res) => this.getTimezone(req, res)); this.router.get('/simple', (_, res) => res.type('json').send(JSON.stringify(this.simpleTimezones, null, 2))); @@ -19,7 +36,7 @@ export default class TimezonesRoute { private getTimezone(req: Request, res: Response): void { if (req.query.q === undefined) { - return void res.type('json').send(JSON.stringify(timezones, null, 2)); + return void res.type('json').send(JSON.stringify(this.#timezones, null, 2)); } const query = String(req.query.q).toLowerCase(); const timeCodes = this.simpleTimezones.filter((item) => { @@ -28,7 +45,7 @@ export default class TimezonesRoute { if (timeCodes.length === 1) { return void res.send(timeCodes[0]); } - const timeTexts = timezones.filter((item) => { + const timeTexts = this.#timezones.filter((item) => { const match = item.text.match(/\(UTC.*\)/); return match !== null ? match.includes(query) : false; }); @@ -39,7 +56,7 @@ export default class TimezonesRoute { return void res.type('json').send(JSON.stringify(timeTexts, null, 2)); } - const matches = timezones.filter((item) => { + const matches = this.#timezones.filter((item) => { if (item.value.toLowerCase().includes(query)) return true; if (item.abbr.toLowerCase().includes(query)) return true; if (item.offset.toString() === query) return true; diff --git a/api/routes/sharp/Prisma.ts b/api/src/routes/sharp/Prisma.ts similarity index 85% rename from api/routes/sharp/Prisma.ts rename to api/src/routes/sharp/Prisma.ts index fc80375..9edc12b 100644 --- a/api/routes/sharp/Prisma.ts +++ b/api/src/routes/sharp/Prisma.ts @@ -1,6 +1,6 @@ import { PrismaClient } from '@prisma/client'; -import { DefaultLogger } from '../../utils/logging/NiceLogger'; +import { DefaultLogger } from '../../utils/logging/NiceLogger.js'; export default class Prisma { public readonly client: PrismaClient; diff --git a/api/routes/sharp/SharpDiscord.ts b/api/src/routes/sharp/SharpDiscord.ts similarity index 80% rename from api/routes/sharp/SharpDiscord.ts rename to api/src/routes/sharp/SharpDiscord.ts index 29182cb..71134d6 100644 --- a/api/routes/sharp/SharpDiscord.ts +++ b/api/src/routes/sharp/SharpDiscord.ts @@ -1,14 +1,13 @@ import Eris, { Client } from 'eris'; -import config from '../../config.json' assert {type: 'json'}; import { DefaultLogger } from '../../utils/logging/NiceLogger.js'; +import { Config } from '../../types/Config.js'; export class SharpDiscord { - private readonly client: Client; + private client: Client; private discordLastDisconnect = 0; - public constructor(public readonly logger: DefaultLogger) { + public constructor(public readonly logger: DefaultLogger, config: Config) { this.client = Eris(config.discord.token); - // Discord events this.client.on('ready', () => { if (Date.now() - this.discordLastDisconnect > 60000) logger.log.info('Discord', 'Client ready'); @@ -20,5 +19,7 @@ export class SharpDiscord { this.logger.log.error('Discord', err); }); void this.client.connect(); + // Discord events + } } diff --git a/api/routes/sharp/managers/TextManager.ts b/api/src/routes/sharp/managers/TextManager.ts similarity index 100% rename from api/routes/sharp/managers/TextManager.ts rename to api/src/routes/sharp/managers/TextManager.ts diff --git a/api/routes/sharp/replaceColor.ts b/api/src/routes/sharp/replaceColor.ts similarity index 100% rename from api/routes/sharp/replaceColor.ts rename to api/src/routes/sharp/replaceColor.ts diff --git a/api/routes/sharp/replaceColorWorker.ts b/api/src/routes/sharp/replaceColorWorker.ts similarity index 100% rename from api/routes/sharp/replaceColorWorker.ts rename to api/src/routes/sharp/replaceColorWorker.ts diff --git a/api/routes/sharp/v1/SharpRoute.ts b/api/src/routes/sharp/v1/SharpRoute.ts similarity index 96% rename from api/routes/sharp/v1/SharpRoute.ts rename to api/src/routes/sharp/v1/SharpRoute.ts index c57614b..c708164 100644 --- a/api/routes/sharp/v1/SharpRoute.ts +++ b/api/src/routes/sharp/v1/SharpRoute.ts @@ -5,10 +5,10 @@ import { ImageEditor } from './managers/ImageEditor.js'; import { ImageManager } from './managers/ImageManager.js'; import TextManager from './managers/TextManager.js'; -import config from '../../../config.json' assert {type: 'json'}; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from '../../../utils/Timer.js'; import { SharpDiscord } from '../SharpDiscord.js'; +import { Config } from '../../../types/Config.js'; export default class SharpRoute { private readonly textManager: TextManager; @@ -16,13 +16,14 @@ export default class SharpRoute { private readonly imageManager: ImageManager; private getRequestCount = 0; public readonly router: Router; - public constructor(public readonly logger: DefaultLogger, public readonly env: NodeJS.ProcessEnv) { + public constructor(public readonly logger: DefaultLogger, public readonly env: NodeJS.ProcessEnv, public readonly config: Config) { this.router = Router(); this.textManager = new TextManager(logger); this.imageEditor = new ImageEditor(logger, this.textManager); this.imageManager = new ImageManager(this.imageEditor, logger); - new SharpDiscord(logger); + + new SharpDiscord(logger, config); this.router.get('*', (_, __, next) => { this.getRequestCount++; @@ -85,7 +86,7 @@ export default class SharpRoute { // Store image private storeImage(req: Request, res: Response): void { const body = req.body as JObject; - const permanent = 'persistKey' in body && body.persistKey === config.persistKey; + const permanent = 'persistKey' in body && body.persistKey === this.config.persistKey; void this.imageEditor.generateImage((req.body as JObject)).then((output) => { void this.imageManager.saveImage(output.image, output.body, permanent).then((fileName) => { diff --git a/api/routes/sharp/v1/managers/Image.ts b/api/src/routes/sharp/v1/managers/Image.ts similarity index 99% rename from api/routes/sharp/v1/managers/Image.ts rename to api/src/routes/sharp/v1/managers/Image.ts index 6fce3f8..a9a86ff 100644 --- a/api/routes/sharp/v1/managers/Image.ts +++ b/api/src/routes/sharp/v1/managers/Image.ts @@ -2,7 +2,7 @@ import sizeOf from 'buffer-image-size'; import { fileTypeFromBuffer } from 'file-type'; import sharp, { Sharp } from 'sharp'; -import { CropOption, InputBody, ReplaceColorBody } from '../../../../types/index.js'; +import { CropOption, InputBody, ReplaceColorBody } from '../../../../types/PayloadTypes.js'; import replaceColor from '../../replaceColor.js'; export default class Image { diff --git a/api/routes/sharp/v1/managers/ImageEditor.ts b/api/src/routes/sharp/v1/managers/ImageEditor.ts similarity index 98% rename from api/routes/sharp/v1/managers/ImageEditor.ts rename to api/src/routes/sharp/v1/managers/ImageEditor.ts index 84f51bb..3944a5e 100644 --- a/api/routes/sharp/v1/managers/ImageEditor.ts +++ b/api/src/routes/sharp/v1/managers/ImageEditor.ts @@ -7,11 +7,12 @@ import Image from './Image.js'; import { ImageFetcher } from './ImageFetcher.js'; import TextManager from './TextManager.js'; -import { AlignmentModes, ChildBody, InputBody, MetaBody, OutputBody, TextBody } from '../../../../types/index.js'; import CacheManager from '../../../../utils/CacheManager.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; import mapBody from '../mapBody/index.js'; +import { MetaBody, OutputBody } from '../../../../types/ImageTypes.js'; +import { AlignmentModes, ChildBody, InputBody, TextBody } from '../../../../types/PayloadTypes.js'; interface SizeObject { width: number; @@ -130,8 +131,7 @@ export class ImageEditor { } } image.sharp = sharp(await image.sharp.toBuffer()); - if (operationTimer.elapsedMS > 500 && property !== 'images') - this.logger.log.image('EditOperation', chalk.white(property), operationTimer.elapsedBlueStr); + this.logger.log.image('EditOperation', chalk.white(property), operationTimer.elapsedBlueStr); } if (compositeOptions.length > 0) { this.compositeImages(image, compositeOptions); diff --git a/api/routes/sharp/v1/managers/ImageFetcher.ts b/api/src/routes/sharp/v1/managers/ImageFetcher.ts similarity index 97% rename from api/routes/sharp/v1/managers/ImageFetcher.ts rename to api/src/routes/sharp/v1/managers/ImageFetcher.ts index 0ee3e63..f62a0fb 100644 --- a/api/routes/sharp/v1/managers/ImageFetcher.ts +++ b/api/src/routes/sharp/v1/managers/ImageFetcher.ts @@ -7,7 +7,7 @@ import * as url from 'url'; import CacheManager from '../../../../utils/CacheManager.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -const assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', 'assets', 'img'); +const assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', '..', 'assets', 'img'); const transparentImagePath = path.join(assetsPath, 'transparent.png'); const circleImagePath = path.join(assetsPath, 'circle-image.png'); const blackImagePath = path.join(assetsPath, 'black.png'); diff --git a/api/routes/sharp/v1/managers/ImageManager.ts b/api/src/routes/sharp/v1/managers/ImageManager.ts similarity index 88% rename from api/routes/sharp/v1/managers/ImageManager.ts rename to api/src/routes/sharp/v1/managers/ImageManager.ts index 0fa3d42..f3b2862 100644 --- a/api/routes/sharp/v1/managers/ImageManager.ts +++ b/api/src/routes/sharp/v1/managers/ImageManager.ts @@ -21,7 +21,10 @@ export class ImageManager { private readonly awaitingSharpBuffer: Record> = {}; private readonly prisma: PrismaClient; - private readonly storedImagesPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', 'images', 'stored'); + //TODO rework/think about the image path, this is kinda nuts + #storedImagesPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', '..', '..', 'data', 'images'); + #legacyImagesPath = path.join(this.#storedImagesPath, '..', 'legacyImages'); + public constructor(public readonly editor: ImageEditor, public readonly logger: DefaultLogger) { this.prisma = new Prisma(logger).client; this.cache = new CacheManager({ refresh: 6, hours: 48 }); @@ -85,22 +88,22 @@ export class ImageManager { } public hasFile(fileName: string): boolean { - return fs.existsSync(path.join(this.storedImagesPath, fileName)); + return fs.existsSync(path.join(this.#storedImagesPath, fileName)); } public hasLegacyFile(fileName: string): boolean { - return fs.existsSync(path.join(this.storedImagesPath, '..', 'images', 'legacy', fileName)); + return fs.existsSync(path.join(this.#legacyImagesPath, fileName)); } public writeFile(buffer: Buffer, fileName: string): void { - fs.writeFile(path.join(this.storedImagesPath, fileName), buffer, (err) => { + fs.writeFile(path.join(this.#storedImagesPath, fileName), buffer, (err) => { if (err !== null) return this.logger.log.error('ImageManager', err); }); } public deleteFile(fileName: string): void { - fs.rmSync(path.join(this.storedImagesPath, fileName)); + fs.rmSync(path.join(this.#storedImagesPath, fileName)); } public async getImage(fileName: string): Promise { @@ -112,11 +115,11 @@ export class ImageManager { return cachedObj.buffer; } else if (this.hasFile(fileName)) { this.updateLastAccessed(fileName); - this.cache.set(fileName, { buffer: fs.readFileSync(path.join(this.storedImagesPath, fileName)) }); + this.cache.set(fileName, { buffer: fs.readFileSync(path.join(this.#storedImagesPath, fileName)) }); return this.cache.get(fileName)?.buffer; } else if (this.hasLegacyFile(fileName)) { - return fs.readFileSync(path.join(this.storedImagesPath, '..', 'images', 'legacy', fileName)); + return fs.readFileSync(path.join(this.#legacyImagesPath, fileName)); } try { const image = await this.prisma.image.findUnique({ @@ -168,7 +171,7 @@ export class ImageManager { private startImageSweep(): void { setInterval(() => void this.sweepImages(), 24 * 3600 * 1000); // Do an image sweep 1 minute after starting - setTimeout(() => void this.sweepImages(), 60 * 1000); + setTimeout(() => void this.sweepImages(), 1 * 1000); } private async sweepImages(): Promise { @@ -184,10 +187,13 @@ export class ImageManager { if (result.length > 0) this.logger.log.prisma('D' + result.join(' and d')); - this.prisma.image.count().then((prismaCount) => { - fs.readdir(this.storedImagesPath, undefined, (_, files) => { - this.logger.log.prisma(`Currently storing ${files.length} images on disk and ${prismaCount} in Prisma`); + this.prisma.image.count().then(async (prismaCount) => { + const files = await fs.promises.readdir(this.#storedImagesPath).catch((err) => { + this.logger.log.error(this.#storedImagesPath, err); + return []; }); + this.logger.log.prisma(`Currently storing ${files.length} images on disk and ${prismaCount} in Prisma`); + }).catch((err) => this.logger.log.error('ImageManager', err)); } diff --git a/api/routes/sharp/v1/managers/TextManager.ts b/api/src/routes/sharp/v1/managers/TextManager.ts similarity index 99% rename from api/routes/sharp/v1/managers/TextManager.ts rename to api/src/routes/sharp/v1/managers/TextManager.ts index 6ca6309..c2bf90f 100644 --- a/api/routes/sharp/v1/managers/TextManager.ts +++ b/api/src/routes/sharp/v1/managers/TextManager.ts @@ -32,7 +32,7 @@ interface LineProp extends Max { } export default class TextManager { private readonly fonts: Map; - private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../../assets/fonts/'; + private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../../../assets/fonts/'; public constructor(public readonly logger: DefaultLogger) { this.fonts = new Map(); diff --git a/api/routes/sharp/v1/mapBody/bodyMappings.ts b/api/src/routes/sharp/v1/mapBody/bodyMappings.ts similarity index 97% rename from api/routes/sharp/v1/mapBody/bodyMappings.ts rename to api/src/routes/sharp/v1/mapBody/bodyMappings.ts index 7eb2cd9..5ce3cce 100644 --- a/api/routes/sharp/v1/mapBody/bodyMappings.ts +++ b/api/src/routes/sharp/v1/mapBody/bodyMappings.ts @@ -1,4 +1,4 @@ -import { mapping } from '../../../../utils/mapping/index.js'; +import { mapping } from './mapping/index.js'; export const body = { cacheDuration: mapping.number.optional, diff --git a/api/routes/sharp/v1/mapBody/index.ts b/api/src/routes/sharp/v1/mapBody/index.ts similarity index 98% rename from api/routes/sharp/v1/mapBody/index.ts rename to api/src/routes/sharp/v1/mapBody/index.ts index d55d01e..9a1ec72 100644 --- a/api/routes/sharp/v1/mapBody/index.ts +++ b/api/src/routes/sharp/v1/mapBody/index.ts @@ -1,7 +1,8 @@ import * as propertyMapping from './bodyMappings.js'; -import { ChildBody, CropOption, InputBody, MetaBody, ResizeOption, TextBody } from '../../../../types/index.js'; import { guard } from '../../../../utils/guard/index.js'; +import { MetaBody } from '../../../../types/ImageTypes.js'; +import { ChildBody, CropOption, InputBody, ResizeOption, TextBody } from '../../../../types/PayloadTypes.js'; const propertyAliases = { bg: 'background', diff --git a/api/utils/mapping/createMapping.ts b/api/src/routes/sharp/v1/mapBody/mapping/createMapping.ts similarity index 100% rename from api/utils/mapping/createMapping.ts rename to api/src/routes/sharp/v1/mapBody/mapping/createMapping.ts diff --git a/api/utils/mapping/index.ts b/api/src/routes/sharp/v1/mapBody/mapping/index.ts similarity index 100% rename from api/utils/mapping/index.ts rename to api/src/routes/sharp/v1/mapBody/mapping/index.ts diff --git a/api/utils/mapping/mapArray.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapArray.ts similarity index 100% rename from api/utils/mapping/mapArray.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapArray.ts diff --git a/api/utils/mapping/mapBase64.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapBase64.ts similarity index 100% rename from api/utils/mapping/mapBase64.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapBase64.ts diff --git a/api/utils/mapping/mapBigInt.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapBigInt.ts similarity index 100% rename from api/utils/mapping/mapBigInt.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapBigInt.ts diff --git a/api/utils/mapping/mapBoolean.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapBoolean.ts similarity index 100% rename from api/utils/mapping/mapBoolean.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapBoolean.ts diff --git a/api/utils/mapping/mapChoice.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapChoice.ts similarity index 100% rename from api/utils/mapping/mapChoice.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapChoice.ts diff --git a/api/utils/mapping/mapDate.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapDate.ts similarity index 100% rename from api/utils/mapping/mapDate.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapDate.ts diff --git a/api/utils/mapping/mapDuration.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapDuration.ts similarity index 100% rename from api/utils/mapping/mapDuration.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapDuration.ts diff --git a/api/utils/mapping/mapFake.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapFake.ts similarity index 100% rename from api/utils/mapping/mapFake.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapFake.ts diff --git a/api/utils/mapping/mapGuard.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapGuard.ts similarity index 100% rename from api/utils/mapping/mapGuard.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapGuard.ts diff --git a/api/utils/mapping/mapIn.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapIn.ts similarity index 100% rename from api/utils/mapping/mapIn.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapIn.ts diff --git a/api/utils/mapping/mapInstanceof.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapInstanceof.ts similarity index 100% rename from api/utils/mapping/mapInstanceof.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapInstanceof.ts diff --git a/api/utils/mapping/mapJObject.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapJObject.ts similarity index 100% rename from api/utils/mapping/mapJObject.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapJObject.ts diff --git a/api/utils/mapping/mapJToken.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapJToken.ts similarity index 100% rename from api/utils/mapping/mapJToken.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapJToken.ts diff --git a/api/utils/mapping/mapJson.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapJson.ts similarity index 100% rename from api/utils/mapping/mapJson.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapJson.ts diff --git a/api/utils/mapping/mapNumber.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapNumber.ts similarity index 100% rename from api/utils/mapping/mapNumber.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapNumber.ts diff --git a/api/utils/mapping/mapObject.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapObject.ts similarity index 100% rename from api/utils/mapping/mapObject.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapObject.ts diff --git a/api/utils/mapping/mapRecord.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapRecord.ts similarity index 100% rename from api/utils/mapping/mapRecord.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapRecord.ts diff --git a/api/utils/mapping/mapRegex.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapRegex.ts similarity index 100% rename from api/utils/mapping/mapRegex.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapRegex.ts diff --git a/api/utils/mapping/mapString.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapString.ts similarity index 100% rename from api/utils/mapping/mapString.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapString.ts diff --git a/api/utils/mapping/mapTuple.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapTuple.ts similarity index 100% rename from api/utils/mapping/mapTuple.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapTuple.ts diff --git a/api/utils/mapping/mapTypeof.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapTypeof.ts similarity index 100% rename from api/utils/mapping/mapTypeof.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapTypeof.ts diff --git a/api/utils/mapping/mapUnknown.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapUnknown.ts similarity index 100% rename from api/utils/mapping/mapUnknown.ts rename to api/src/routes/sharp/v1/mapBody/mapping/mapUnknown.ts diff --git a/api/utils/mapping/result.ts b/api/src/routes/sharp/v1/mapBody/mapping/result.ts similarity index 100% rename from api/utils/mapping/result.ts rename to api/src/routes/sharp/v1/mapBody/mapping/result.ts diff --git a/api/utils/mapping/types.ts b/api/src/routes/sharp/v1/mapBody/mapping/types.ts similarity index 100% rename from api/utils/mapping/types.ts rename to api/src/routes/sharp/v1/mapBody/mapping/types.ts diff --git a/api/routes/sharp/v2/Context.ts b/api/src/routes/sharp/v2/Context.ts similarity index 61% rename from api/routes/sharp/v2/Context.ts rename to api/src/routes/sharp/v2/Context.ts index fc89c4d..5aaeae7 100644 --- a/api/routes/sharp/v2/Context.ts +++ b/api/src/routes/sharp/v2/Context.ts @@ -10,13 +10,19 @@ export type CompletedWithBuffer = OperationSummaryObject & { buffer: Buffer }; type CompletedWithoutBuffer = Omit; interface ContextObject { + background: { + src: string; + duration: number; + } operations: CompletedWithoutBuffer[]; - warnings: CompletedWithoutBuffer[]; - errors: CompletedWithoutBuffer[] + warnings: string[]; + errors: string[] } export default class ImageContext { public operations: CompletedOperationObject[] = []; + private generalWarnings: string[] = []; + private generalErrors: string[] = []; public constructor(public readonly logger: DefaultLogger, public readonly image: Image) { } @@ -49,15 +55,40 @@ export default class ImageContext { return this.operations.filter((e): e is CompletedWithBuffer => !e.halted && e.buffer !== undefined); } + public addDebug(type: 'warn' | 'error', str: string): void { + switch (type) { + case 'warn': + this.generalWarnings.push(str); + break; + case 'error': + this.generalErrors.push(str); + break; + } + } + public toJSON(): ContextObject { return { + background: { + src: this.image.background, + duration: this.image.fetchDuration + }, operations: this.operations.map((e) => this.omitBuffer(e)), - warnings: this.operations.filter((e) => e.debug.warnings.length > 0).map((e) => this.omitBuffer(e)), - errors: this.operations.filter((e) => e.halted || e.debug.errors.length > 0).map((e) => this.omitBuffer(e)) + warnings: this.generalWarnings.concat(...this.formatOperationsDebug('warnings')), + errors: this.generalErrors.concat(...this.formatOperationsDebug('errors')) }; } + private formatOperationsDebug(type: 'warnings' | 'errors'): string[] { + return this.operations.reduce((a, c, index) => { + if (c.debug[type].length === 0) + return a; + a.push(...c.debug[type].map((str) => `[${c.type}:${index}]: ${str}`)); + return a; + }, []); + } + private omitBuffer(opObject: CompletedOperationObject): CompletedWithoutBuffer { - return Object.assign(opObject, { buffer: undefined }); + const { buffer: _, ...obj } = opObject; + return obj; } } diff --git a/api/routes/sharp/v2/Image.ts b/api/src/routes/sharp/v2/Image.ts similarity index 75% rename from api/routes/sharp/v2/Image.ts rename to api/src/routes/sharp/v2/Image.ts index 609dbe6..30cbe71 100644 --- a/api/routes/sharp/v2/Image.ts +++ b/api/src/routes/sharp/v2/Image.ts @@ -9,21 +9,28 @@ import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; export default class Image { public readonly context: Context; public readonly id: string; + public readonly background: string; + public fetchDuration: number; #sharp: Sharp; #width: number; #height: number; + #buffer: Buffer; - public constructor(public readonly logger: DefaultLogger, buffer: Buffer, public readonly background: string) { + public constructor(public readonly logger: DefaultLogger, buffer: Buffer, background: string, fetchDuration = 0) { this.context = new Context(logger, this); this.id = uuidv4(); + this.background = background; + this.fetchDuration = fetchDuration; + const { width, height } = sizeOf(buffer); this.#width = width; this.#height = height; this.#sharp = sharp(buffer); + this.#buffer = buffer; } public get sharp(): Sharp { @@ -50,16 +57,27 @@ export default class Image { this.#height = height; } + public get buffer(): Buffer { + return this.#buffer; + } + public async updateBuffer(): Promise { const newBuffer = await this.#sharp.toBuffer(); - this.#sharp = sharp(newBuffer); - return newBuffer; + return this.setBuffer(newBuffer); } - public setBuffer(buffer: Buffer): void { + public setBuffer(buffer: Buffer): Buffer { + if (this.#buffer === buffer) + return buffer; + this.#buffer = buffer; this.#sharp = sharp(buffer); // Update dimensions this.setDimensions(buffer); + return buffer; + } + + public async getFormat(defaultFormat = 'png'): Promise { + return (await this.#sharp.metadata()).format ?? defaultFormat; } private setDimensions(buffer: Buffer): void { @@ -68,7 +86,4 @@ export default class Image { this.#height = height; } - public async getFormat(defaultFormat = 'png'): Promise { - return (await this.#sharp.metadata()).format ?? defaultFormat; - } } diff --git a/api/src/routes/sharp/v2/Operation.ts b/api/src/routes/sharp/v2/Operation.ts new file mode 100644 index 0000000..7374dfe --- /dev/null +++ b/api/src/routes/sharp/v2/Operation.ts @@ -0,0 +1,122 @@ +import chalk from 'chalk'; +import { Static, TSchema, Type } from '@sinclair/typebox'; +import { TypeCheck, TypeCompiler } from '@sinclair/typebox/compiler'; + +import Image from './Image.js'; +import OperationDetails from './OperationSummary.js'; +import OperationSummary from './OperationSummary.js'; + +import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; + +export type IGeneralOperation = new (logger: DefaultLogger) => IOperation; + +export interface IOperation { + name: string; + aliases: string[]; + execute: (image: Image, data: unknown) => Promise; + isValidData: (data: unknown) => boolean; +} + +export interface OperationInfo { + name: string; + aliases?: string[]; + schema: D; + execute: (image: Image, data: Static, summary?: OperationSummary) => Promise | Image; + dataPropertyAliases?: Record; +} + +export interface GenericOperation { + type: T; + data: D; +} + +export default class Operation implements IOperation { + public readonly name: string; + public readonly aliases: string[]; + public readonly dataPropertyAliases?: Record; + public readonly schema: D; + + private compiler: TypeCheck; + + #genericObject = TypeCompiler.Compile(Type.Record(Type.String(), Type.Unknown())); + + #execute: (image: Image, data: Static, details: OperationDetails) => Promise | Image; + + public constructor(public readonly logger: DefaultLogger, info: OperationInfo) { + this.name = info.name; + this.dataPropertyAliases = info.dataPropertyAliases; + this.aliases = info.aliases ?? []; + + this.schema = info.schema; + this.compiler = TypeCompiler.Compile(this.schema); + + this.#execute = info.execute; + } + + private convertAliases(data: unknown): unknown { + if (this.dataPropertyAliases !== undefined) { + if (this.#genericObject.Check(data)) { + for (const key of Object.keys(data)) { + if (key in this.dataPropertyAliases) { + data[this.dataPropertyAliases[key]] = data[key]; + delete data[key]; + } + } + } + } + return data; + } + + public async execute(image: Image, data: unknown): Promise { + const summary = new OperationSummary(this.name, data, image); + + if (!this.isValidData(data)) { + const errorIterables = this.compiler.Errors(data); + const errors: string[] = []; + for (const error of errorIterables) { + // Properties have a leading / in front, I'm not sure if this has any negative effects so this is still W.I.P + const valuePath = error.path.slice(1); + errors.push(`${valuePath} ${error.message}`.trimStart()); + } + this.error(summary, `Invalid data: ${errors.join(', ')}`); + return image; + } + + try { + const imageAfter = await this.#execute(image, data, summary); + const newBuffer = await image.updateBuffer(); + image.context.addOperation(summary, newBuffer); + + /* + Currently nothing actually requires execute() to return anything, so.... + (and no operation changes the image class either) + */ + return imageAfter; + } catch (err: unknown) { + this.logger.log.operation(chalk.red.bold(`${this.name}`, err)); + + this.error(summary, String(err)); + return image; + } + } + + protected error(summary: OperationSummary, error: string, halt = true): void { + summary.addError(error); + if (halt) { + summary.halt(); + summary.image.context.addOperation(summary); + } + this.logger.log.error(error); + } + + public isValidData(data: unknown): data is Static { + try { + data = this.convertAliases(data); + return this.compiler.Check(data); + } catch (err: unknown) { + this.logger.log.error('isValidData', err); + return false; + } + } + +} diff --git a/api/routes/sharp/v2/OperationSummary.ts b/api/src/routes/sharp/v2/OperationSummary.ts similarity index 97% rename from api/routes/sharp/v2/OperationSummary.ts rename to api/src/routes/sharp/v2/OperationSummary.ts index a095484..f3d98a5 100644 --- a/api/routes/sharp/v2/OperationSummary.ts +++ b/api/src/routes/sharp/v2/OperationSummary.ts @@ -1,4 +1,4 @@ -import Image from './Image'; +import Image from './Image.js'; import Timer from '../../../utils/Timer.js'; diff --git a/api/routes/sharp/v2/Operations.ts.disabled b/api/src/routes/sharp/v2/Operations.ts.disabled similarity index 100% rename from api/routes/sharp/v2/Operations.ts.disabled rename to api/src/routes/sharp/v2/Operations.ts.disabled diff --git a/api/routes/sharp/v2/SharpRoute.ts b/api/src/routes/sharp/v2/SharpRoute.ts similarity index 100% rename from api/routes/sharp/v2/SharpRoute.ts rename to api/src/routes/sharp/v2/SharpRoute.ts diff --git a/api/routes/sharp/v2/operations/Crop.ts b/api/src/routes/sharp/v2/operations/Crop.ts similarity index 64% rename from api/routes/sharp/v2/operations/Crop.ts rename to api/src/routes/sharp/v2/operations/Crop.ts index 9f6db5b..081acc9 100644 --- a/api/routes/sharp/v2/operations/Crop.ts +++ b/api/src/routes/sharp/v2/operations/Crop.ts @@ -1,23 +1,25 @@ // TODO mode: 'box' -> x,y,w,h; mode: 'auto' -> specify background https://sharp.pixelplumbing.com/api-resize#trim +import { Static, Type } from '@sinclair/typebox'; + import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../../utils/mapping/index.js'; import Image from '../Image.js'; import Operation from '../Operation.js'; -export type CropData = 'auto' | { x?: number; y?: number; width?: number; height?: number; }; +const cropSchema = Type.Union([ + Type.Literal('auto'), + Type.Object({ + x: Type.Optional(Type.Number()), + y: Type.Optional(Type.Number()), + width: Type.Optional(Type.Number()), + height: Type.Optional(Type.Number()) + }) +]); -export default class Crop extends Operation { +export default class Crop extends Operation { public constructor(public readonly logger: DefaultLogger) { super(logger, { name: 'crop', - mapping: mapping.choice( - mapping.guard((v): v is 'auto' => v === 'auto'), - mapping.object({ - width: mapping.number.optional, - height: mapping.number.optional, - x: mapping.number.optional, - y: mapping.number.optional - })), + schema: cropSchema, execute: (image, data) => this.cropImage(image, data), dataPropertyAliases: { w: 'width', @@ -28,7 +30,7 @@ export default class Crop extends Operation { }); } - private cropImage(image: Image, data: CropData): Image { + private cropImage(image: Image, data: Static): Image { if (data === 'auto') { image.sharp.trim({ background: '#00000000' }); } else { diff --git a/api/routes/sharp/v2/operations/Fill.ts b/api/src/routes/sharp/v2/operations/Fill.ts similarity index 79% rename from api/routes/sharp/v2/operations/Fill.ts rename to api/src/routes/sharp/v2/operations/Fill.ts index 0c62b4a..8bc40a8 100644 --- a/api/routes/sharp/v2/operations/Fill.ts +++ b/api/src/routes/sharp/v2/operations/Fill.ts @@ -1,14 +1,16 @@ import sharp from 'sharp'; +import { Type } from '@sinclair/typebox'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../../utils/mapping/index.js'; import Operation from '../Operation.js'; -export default class Fill extends Operation { +const fillSchema = Type.String(); + +export default class Fill extends Operation { public constructor(public readonly logger: DefaultLogger) { super(logger, { name: 'fill', - mapping: mapping.string, + schema: fillSchema, execute: (image, data) => { if (image.background !== '') return image; //TODO replace colour?? diff --git a/api/routes/sharp/v2/operations/Flip.ts b/api/src/routes/sharp/v2/operations/Flip.ts similarity index 75% rename from api/routes/sharp/v2/operations/Flip.ts rename to api/src/routes/sharp/v2/operations/Flip.ts index cafcc9d..905eefe 100644 --- a/api/routes/sharp/v2/operations/Flip.ts +++ b/api/src/routes/sharp/v2/operations/Flip.ts @@ -1,12 +1,15 @@ +import { Type } from '@sinclair/typebox'; + import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../../utils/mapping/index.js'; import Operation from '../Operation.js'; -export default class Flip extends Operation<1 | 2 | 3> { +const flipSchema = Type.Union([Type.Literal(1), Type.Literal(2), Type.Literal(3)]); + +export default class Flip extends Operation { public constructor(public readonly logger: DefaultLogger) { super(logger, { name: 'flip', - mapping: mapping.guard((v): v is 1 | 2 | 3 => [1, 2, 3].includes(v)), + schema: flipSchema, execute: (image, data) => { switch (data) { case 1: diff --git a/api/routes/sharp/v2/operations/Images.ts b/api/src/routes/sharp/v2/operations/Images.ts similarity index 100% rename from api/routes/sharp/v2/operations/Images.ts rename to api/src/routes/sharp/v2/operations/Images.ts diff --git a/api/routes/sharp/v2/operations/Opacity.ts b/api/src/routes/sharp/v2/operations/Opacity.ts similarity index 77% rename from api/routes/sharp/v2/operations/Opacity.ts rename to api/src/routes/sharp/v2/operations/Opacity.ts index 9279526..fbd1614 100644 --- a/api/routes/sharp/v2/operations/Opacity.ts +++ b/api/src/routes/sharp/v2/operations/Opacity.ts @@ -1,14 +1,17 @@ +import { Type } from '@sinclair/typebox'; + import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../../utils/mapping/index.js'; import Image from '../Image.js'; import Operation from '../Operation.js'; -export default class Opacity extends Operation { +const opacitySchema = Type.Number({ maximum: 1, minimum: 0 }); + +export default class Opacity extends Operation { public constructor(public readonly logger: DefaultLogger) { super(logger, { name: 'opacity', aliases: ['o'], - mapping: mapping.number, + schema: opacitySchema, execute: (img, data) => this.changeOpacity(img, data) }); } diff --git a/api/src/routes/sharp/v2/operations/ReplaceColor.ts b/api/src/routes/sharp/v2/operations/ReplaceColor.ts new file mode 100644 index 0000000..3d4dd4a --- /dev/null +++ b/api/src/routes/sharp/v2/operations/ReplaceColor.ts @@ -0,0 +1,5 @@ +// mapping.object({ +// target: mapping.string, +// replace: mapping.string, +// delta: mapping.number.optional +// }); diff --git a/api/routes/sharp/v2/operations/Resize.ts b/api/src/routes/sharp/v2/operations/Resize.ts similarity index 52% rename from api/routes/sharp/v2/operations/Resize.ts rename to api/src/routes/sharp/v2/operations/Resize.ts index 124acc5..f1d9b95 100644 --- a/api/routes/sharp/v2/operations/Resize.ts +++ b/api/src/routes/sharp/v2/operations/Resize.ts @@ -1,5 +1,6 @@ +import { Type } from '@sinclair/typebox'; + import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../../utils/mapping/index.js'; import Operation from '../Operation.js'; export interface ResizeData { @@ -7,7 +8,12 @@ export interface ResizeData { height?: number; } -export default class ResizeOperation extends Operation { +const resizeSchema = Type.Object({ + width: Type.Optional(Type.Number()), + height: Type.Optional(Type.Number()) +}); + +export default class ResizeOperation extends Operation { public constructor(public readonly logger: DefaultLogger) { super(logger, { name: 'resize', @@ -15,17 +21,12 @@ export default class ResizeOperation extends Operation { w: 'width', h: 'height' }, - mapping: mapping.choice(mapping.object({ - width: mapping.number.optional, - height: mapping.number.optional - }), mapping.object({ - width: mapping.number - }), mapping.object({ - height: mapping.number - }) - ), + schema: resizeSchema, execute: (image, data) => { - if (image.width === (data.width ?? image.width) && image.height === (data.height ?? image.height)) + const targetWidth = data.width ?? image.width; + const targetHeight = data.height ?? image.height; + + if (image.width === targetWidth && image.height === targetHeight) return image; image.sharp.resize(data.width ?? null, data.height ?? null); return image; diff --git a/api/routes/sharp/v2/operations/Rotate.ts b/api/src/routes/sharp/v2/operations/Rotate.ts similarity index 66% rename from api/routes/sharp/v2/operations/Rotate.ts rename to api/src/routes/sharp/v2/operations/Rotate.ts index fb007de..b6b36d2 100644 --- a/api/routes/sharp/v2/operations/Rotate.ts +++ b/api/src/routes/sharp/v2/operations/Rotate.ts @@ -1,12 +1,16 @@ +import { Type } from '@sinclair/typebox'; + import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import { mapping } from '../../../../utils/mapping/index.js'; import Operation from '../Operation.js'; -export default class Rotate extends Operation { +//Specify range maybe? +const rotateSchema = Type.Number(); + +export default class Rotate extends Operation { public constructor(public readonly logger: DefaultLogger) { super(logger, { name: 'rotate', - mapping: mapping.number, + schema: rotateSchema, execute: (image, data) => { image.sharp.rotate(data, { background: '#00000000' }); return image; diff --git a/api/src/routes/sharp/v2/operations/Text.ts b/api/src/routes/sharp/v2/operations/Text.ts new file mode 100644 index 0000000..5c53fcf --- /dev/null +++ b/api/src/routes/sharp/v2/operations/Text.ts @@ -0,0 +1,257 @@ +// import sizeOf from 'buffer-image-size'; +// import _ from 'lodash'; +// import { Static, Type } from '@sinclair/typebox'; + +// import { AlignmentModes, InputOptions } from '../../../../types/PayloadTypes.js'; +// import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +// import { mapping } from '../../../../utils/mapping/index.js'; +// import Timer from '../../../../utils/Timer.js'; +// import Image from '../Image.js'; +// import Operation from '../Operation.js'; +// import { TextManager } from '../services/TextManager.js'; + +// interface SizeObject { +// width: number; +// height: number; +// } +// interface Coords { +// x: number; +// y: number; +// } + +// const optionsSchema = Type.Partial(Type.Object({ +// text: Type.String(), +// size: Type.Number(), +// font: Type.String(), +// textAlign: Type.Union([Type.Literal('left'), Type.Literal('center'), Type.Literal('right')]), +// color: Type.String(), +// textColor: Type.String(), +// backgroundColor: Type.String(), +// lineSpacing: Type.Number(), +// maxWidth: Type.Number(), +// strokeWidth: Type.Number(), +// strokeColor: Type.String(), +// padding: Type.Number(), +// paddingLeft: Type.Number(), +// paddingRight: Type.Number(), +// paddingTop:Type.Number(), +// paddingBottom: Type.Number(), +// borderWidth: Type.Number(), +// borderLeftWidth:Type.Number(), +// borderRightWidth: Type.Number(), +// borderBottomWidth:Type.Number(), +// borderTopWidth: Type.Number(), +// borderColor: Type.String(), +// localFontPath: Type.String(), +// localFontName:Type.String(), +// output: Type.Union([Type.Literal('buffer'), Type.Literal('stream'), Type.Literal('dataURL'), Type.Literal('canvas')]) +// })); + +// const textSchema = Type.Array(Type.Partial(Type.Object({ +// x: Type.Number(), +// y: Type.Number(), +// alignment: Type.Union([ +// Type.Literal('top-left'), +// Type.Literal('top-middle'), +// Type.Literal('top-right'), +// Type.Literal('left'), +// Type.Literal('center'), +// Type.Literal('right'), +// Type.Literal('bot-left'), +// Type.Literal('bot-middle'), +// Type.Literal('bot-right') +// ]), +// options: optionsSchema +// }))); + +// interface TextOperationData { +// options: InputOptions; +// x?: number; +// y?: number; +// alignment?: AlignmentModes; +// } + +// interface CachedText { +// input: InputOptions; +// buffer: Buffer; +// maxWidth: number; +// width: number; +// height: number; +// fit?: ResizedToFitData; +// } + +// interface ResizedToFitData { +// buffer: Buffer; +// maxWidth: number; +// left: number; +// top: number; +// } + +// export default class Text extends Operation { +// private readonly manager: TextManager; +// private readonly cache: Record = {}; +// public constructor(public readonly logger: DefaultLogger) { +// super(logger, { +// name: 'text', +// schema: textSchema, +// dataPropertyAliases: { +// 'p': 'position', +// 'pos': 'position', +// 'o': 'options', +// 'ops': 'options', +// 'options[].color': 'textColor', +// 'options[].bgColor': 'backgroundColor' +// }, +// execute: (image, data) => this.addTextImages(image, data) +// }); +// this.manager = new TextManager(logger); +// } + +// private async addTextImages(image: Image, textObjects: Static): Promise { +// const textArray: { buffer: Buffer; data: TextOperationData; }[] = []; +// for (const textObject of textObjects) { +// const options = textObject.options ?? {}; +// const text = options.text ?? ''; +// const maxWidth = options.maxWidth ?? image.width; + +// this.logger.log.operation(options); + +// const textPngTimer = new Timer(true); +// let textBuffer: Buffer | undefined; +// if (text in this.cache) { +// for (const cachedText of this.cache[text]) { +// if (cachedText.maxWidth >= maxWidth && cachedText.width <= maxWidth) { +// if (_.isEqual(cachedText.input, options)) { +// textBuffer = cachedText.buffer; +// break; +// } +// } +// } +// } +// if (textBuffer === undefined) { +// textBuffer = this.manager.text2png(text, { ...options, maxWidth }); +// if (!(text in this.cache)) +// this.cache[text] = []; +// const { width, height } = sizeOf(textBuffer); + +// this.cache[text].push({ +// input: options, +// buffer: textBuffer, +// maxWidth, +// width, +// height +// }); + +// } +// this.logger.log.time('Text2Png', textPngTimer.elapsedBlueStr); +// textArray.push({ +// buffer: textBuffer, +// data: textObject +// }); + +// } +// const compositeOptions = await Promise.all(textArray.map(async (text) => { +// const overlayOption = { +// input: text.buffer, +// left: 0, +// top: 0 +// }; +// const { width, height } = sizeOf(text.buffer); +// const alignCoords = this.getAlignCoords(image, { width, height }, text.data.alignment ?? 'top-left'); +// const coords = { x: text.data.x ?? 0, y: text.data.y ?? 0 }; +// const [leftOffset, topOffset] = [alignCoords.x + coords.x, alignCoords.y + coords.y]; +// const parentDimensions = { width: image.width, height: image.height }; +// const textDimensions = { width, height }; + +// if (!this.canImageFit(parentDimensions, textDimensions)) { +// this.logger.log.operation('Text', 'Cannot fit'); +// overlayOption.input = await this.fitImage(parentDimensions, new Image(this.logger, text.buffer, ''), coords, alignCoords).sharp.toBuffer(); + +// // If the offset is set outside the image, that region will be cropped out already so it shouldn't be offset. +// if (leftOffset > 0) +// overlayOption.left += leftOffset; +// if (topOffset > 0) +// overlayOption.top += topOffset; +// } else { +// overlayOption.left = leftOffset; +// overlayOption.top = topOffset; +// } +// this.logger.log.operation(overlayOption); +// return overlayOption; +// })); + +// image.sharp.composite(compositeOptions); +// return image; +// } + +// private getAlignCoords(parentImage: Image, childSize: SizeObject, alignment: AlignmentModes): Coords { +// const alignCoords = { +// x: 0, +// y: 0 +// }; +// switch (alignment) { +// case 'top-left': +// break; +// case 'top-middle': +// alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); +// break; +// case 'top-right': +// alignCoords.x = parentImage.width - childSize.width; +// break; +// case 'left': +// alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); +// break; +// case 'center': +// alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); +// alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); +// break; +// case 'right': +// alignCoords.x = parentImage.width - childSize.width; +// alignCoords.y = Math.round(parentImage.height / 2 - childSize.height / 2); +// break; +// case 'bot-left': +// alignCoords.y = parentImage.height - childSize.height; +// break; +// case 'bot-middle': +// alignCoords.x = Math.round(parentImage.width / 2 - childSize.width / 2); +// alignCoords.y = parentImage.height - childSize.height; +// break; +// case 'bot-right': +// alignCoords.x = parentImage.width - childSize.width; +// alignCoords.y = parentImage.height - childSize.height; +// break; +// } +// return alignCoords; +// } + +// //can fit without the child image being outside the parent in any way +// private canImageFit(parentDimensions: SizeObject, childDimensions: SizeObject): boolean { +// if (childDimensions.width > parentDimensions.width) +// return false; +// if (childDimensions.height > parentDimensions.height) +// return false; +// return true; +// } + +// private fitImage(fitDimensions: SizeObject, image: Image, offset: Coords, alignOffset: Coords): Image { +// const [left, top] = [alignOffset.x + offset.x, alignOffset.y + offset.y]; +// const cropRegion = { +// width: image.width, +// height: image.height, +// left: 0, +// top: 0 +// }; +// if (image.width > fitDimensions.width) { +// cropRegion.width = Math.min(fitDimensions.width, image.width - Math.abs(left)); +// if (left < 0) +// cropRegion.left = -left; +// } +// if (image.height > fitDimensions.height) { +// cropRegion.height = Math.min(fitDimensions.height, image.height - Math.abs(top)); +// if (top < 0) +// cropRegion.top = -top; +// } +// image.sharp.extract(cropRegion); +// return image; +// } +// } diff --git a/api/routes/sharp/v2/services/ImageEditor.ts b/api/src/routes/sharp/v2/services/ImageEditor.ts similarity index 52% rename from api/routes/sharp/v2/services/ImageEditor.ts rename to api/src/routes/sharp/v2/services/ImageEditor.ts index 9578ba3..865669b 100644 --- a/api/routes/sharp/v2/services/ImageEditor.ts +++ b/api/src/routes/sharp/v2/services/ImageEditor.ts @@ -1,17 +1,18 @@ //import _ from 'lodash'; import ImageFetcher from './ImageFetcher.js'; +import OperationHandler from './OperationHandler.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; import Image from '../Image.js'; -import OperationHandler from '../OperationHandler.js'; import { validateRootInput } from '../validateInput.js'; import { CompletedOperationObject } from '../Context.js'; +export type CachedOperationMap = Record; export type CachedOperation = (CompletedOperationObject) & { buffer: Buffer; - nextOperations?: CachedOperation[]; + nextOperationMap?: CachedOperationMap; }; export class ImageEditor { @@ -27,27 +28,37 @@ export class ImageEditor { const validatedInput = validateRootInput(input); if (validatedInput === undefined) - return new Image(this.logger, this.fetcher.defaultImageBuffer, 'invalid'); // TODO HANDLE INVALID INPUT + return new Image(this.logger, this.fetcher.defaultImageBuffer, 'Invalid input', 0); // TODO HANDLE INVALID INPUT - const imageBuffer = await this.fetcher.fetchImage(validatedInput.background); - if (imageBuffer === undefined) - return new Image(this.logger, this.fetcher.defaultImageBuffer, 'invalid'); // TODO HANDLE INVALID BACKGROUND + const image = this.createDefaultImage(validatedInput.background); - const image = new Image(this.logger, imageBuffer, validatedInput.background); // Use the cache of any operation that is already cached - const operationCache = this.operationHandler.getCachedBuffer(image, validatedInput); - if (operationCache !== undefined) - image.setBuffer(operationCache.buffer); + const cachedImage = this.operationHandler.getCachedBuffer(image, validatedInput); + // If not cached, fetch the image + if (cachedImage === undefined) { + const fetchTimer = new Timer(true); + const imageBuffer = await this.fetcher.fetchImage(validatedInput.background); + if (imageBuffer === undefined) { + image.fetchDuration = Number(fetchTimer.elapsedMS); + image.context.addDebug('error', 'Invalid background source'); + return image; + } + image.setBuffer(imageBuffer); + image.fetchDuration = Number(fetchTimer.elapsedMS); + } else { + image.setBuffer(cachedImage.buffer); + } + const remainingOperations = cachedImage !== undefined ? cachedImage.remainingOperations : validatedInput.operations; // Execute operations that are not cached - for (const inputObj of operationCache !== undefined ? operationCache.remainingOperations : validatedInput.operations) { - const opTimer = new Timer(true); + for (const inputObj of remainingOperations) { const operation = this.operationHandler.getOperation(image.context, inputObj); if (operation === undefined) continue; + const opTimer = new Timer(true); await operation.execute(image, inputObj.data); - this.logger.log.operation(operation.name, opTimer.elapsedBlueStr); + this.logger.log.operation(`Executed ${inputObj.type}`, opTimer.elapsedBlueStr); } this.operationHandler.cacheOperations(image); @@ -56,4 +67,8 @@ export class ImageEditor { return image; } + private createDefaultImage(src = ''): Image { + return new Image(this.logger, this.fetcher.defaultImageBuffer, src); + } + } diff --git a/api/routes/sharp/v2/services/ImageFetcher.ts b/api/src/routes/sharp/v2/services/ImageFetcher.ts similarity index 93% rename from api/routes/sharp/v2/services/ImageFetcher.ts rename to api/src/routes/sharp/v2/services/ImageFetcher.ts index af463f5..5fe0e96 100644 --- a/api/routes/sharp/v2/services/ImageFetcher.ts +++ b/api/src/routes/sharp/v2/services/ImageFetcher.ts @@ -8,7 +8,7 @@ import CacheManager from '../../../../utils/CacheManager.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; -const transparentImagePath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', 'assets', 'img', 'transparent.png'); +const transparentImagePath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', '..', 'assets', 'img', 'transparent.png'); export default class ImageFetcher { public cache: CacheManager<{ buffer: Buffer; }>; diff --git a/api/routes/sharp/v2/services/ImageManager.ts b/api/src/routes/sharp/v2/services/ImageManager.ts similarity index 100% rename from api/routes/sharp/v2/services/ImageManager.ts rename to api/src/routes/sharp/v2/services/ImageManager.ts diff --git a/api/routes/sharp/v2/OperationHandler.ts b/api/src/routes/sharp/v2/services/OperationHandler.ts similarity index 68% rename from api/routes/sharp/v2/OperationHandler.ts rename to api/src/routes/sharp/v2/services/OperationHandler.ts index 24bf85d..c436b66 100644 --- a/api/routes/sharp/v2/OperationHandler.ts +++ b/api/src/routes/sharp/v2/services/OperationHandler.ts @@ -3,23 +3,24 @@ import _ from 'lodash'; import fs from 'fs'; import { fileURLToPath } from 'url'; +import path from 'path'; -import Context, { CompletedOperationObject } from './Context.js'; -import Image from './Image.js'; -import Operation, { IGeneralOperation, IOperation } from './Operation.js'; -import { CachedOperation } from './services/ImageEditor.js'; -import { ValidInputObject } from './validateInput.js'; -import OperationSummary from './OperationSummary.js'; +import { CachedOperation, CachedOperationMap } from './ImageEditor.js'; -import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import Context, { CompletedOperationObject } from '../Context.js'; +import Image from '../Image.js'; +import Operation, { IGeneralOperation, IOperation } from '../Operation.js'; +import { ValidInputObject } from '../validateInput.js'; +import OperationSummary from '../OperationSummary.js'; +import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; interface ExportObj { default: unknown; } -const operationPath = fileURLToPath(new URL('.', import.meta.url)) + '/operations/'; +const operationPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', 'operations'); export default class OperationHandler { - private readonly cache: Record = {}; + private readonly cache: Record = {}; private readonly operations = new Map(); public constructor(public readonly logger: DefaultLogger) { @@ -54,33 +55,37 @@ export default class OperationHandler { // The array of operations that are cached let cachedOperations = this.cache[input.background]; let cachedUntilOperation = 0; + mainOperationLoop: for (let i = 0; i < input.operations.length; i++) { const operation = this.getOperation(image.context, input.operations[i]); if (operation === undefined) continue; - const operationData = operation.validateData(image.context, input.operations[i].data); - if (operationData === undefined) + const isValid = operation.isValidData(input.operations[i].data); + if (!isValid) continue; //TODO error/warning const validOperationObject = { type: operation.name, - data: operationData as JToken + data: input.operations[i].data }; - for (const cachedOperation of cachedOperations) { - if (this.isEqual(validOperationObject, cachedOperation)) { - const cachedSummary = new OperationSummary(cachedOperation.type, cachedOperation.data, image); - image.context.addOperation(cachedSummary, cachedOperation.buffer); - currentOperation = cachedOperation; - cachedUntilOperation = i + 1; - this.logger.log.operation(operation.name, 'Using cache'); - if (cachedOperation.nextOperations === undefined) { - break mainOperationLoop; + if (validOperationObject.type in cachedOperations) { + for (const cachedOperation of cachedOperations[validOperationObject.type]) { + if (this.isEqual(validOperationObject, cachedOperation)) { + const cachedSummary = new OperationSummary(cachedOperation.type, cachedOperation.data, image); + image.context.addOperation(cachedSummary, cachedOperation.buffer); + + currentOperation = cachedOperation; + cachedUntilOperation = i + 1; + + if (cachedOperation.nextOperationMap === undefined) { + break mainOperationLoop; + } + cachedOperations = cachedOperation.nextOperationMap; + continue mainOperationLoop; } - cachedOperations = cachedOperation.nextOperations; - continue mainOperationLoop; } } cachedUntilOperation = i; @@ -97,39 +102,33 @@ export default class OperationHandler { public cacheOperations(image: Image): void { const appliedOperations = image.context.getAppliedOperations(); if (!(image.background in this.cache)) - this.cache[image.background] = []; - - // The cached operation that it's currently using - let currentOperation: CachedOperation | undefined; - // The array of operations that are cached - let cachedOperations = this.cache[image.background]; - let newOperations = 0; - - mainOperationLoop: - for (const operation of appliedOperations) { - if (cachedOperations.length !== 0) { - for (const cachedOperation of cachedOperations) - if (this.isEqual(operation, cachedOperation)) { - currentOperation = cachedOperation; - cachedOperations = cachedOperation.nextOperations ?? []; - continue mainOperationLoop; + this.cache[image.background] = {}; + + let currentBranch = this.cache[image.background]; + + appliedOperationloop: + for (const appliedOperation of appliedOperations) { + const type = appliedOperation.type; + // Check if the same operation has been applied before + if (type in currentBranch) { + for (const cachedOperation of currentBranch[type]) { + if (this.isEqual(appliedOperation, cachedOperation)) { + if (cachedOperation.nextOperationMap === undefined) + cachedOperation.nextOperationMap = {}; + currentBranch = cachedOperation.nextOperationMap; + continue appliedOperationloop; } + } } - newOperations++; - if (currentOperation !== undefined) { - cachedOperations = []; - if (currentOperation.nextOperations === undefined) - currentOperation.nextOperations = []; - currentOperation.nextOperations.push(operation); - - // Update currentOperation - currentOperation = currentOperation.nextOperations[currentOperation.nextOperations.length - 1]; - continue; - } - this.cache[image.background].push(operation); - currentOperation = operation; + + if (!(type in currentBranch)) + currentBranch[type] = []; + const nextBranch: CachedOperation = { ...appliedOperation, nextOperationMap: {} }; + currentBranch[type].push(nextBranch); + currentBranch = nextBranch.nextOperationMap!; } - this.logger.log.operation('OperationHandler', `Added ${newOperations} operations`); + + //this.logger.log.operation('OperationHandler', `Added ${newOperations} operations`); } private async initOperations(): Promise { @@ -166,11 +165,10 @@ export default class OperationHandler { if (!fileName.endsWith('.js')) continue; - await import(operationPath + fileName).then((contents: unknown) => { + await import(path.join(operationPath, fileName)).then((contents: unknown) => { //? Check if it's an object with a 'default' property if (this.isExportObject(contents)) { if (this.isOperation(contents)) { - this.logger.log.operation('yes'); // The infamous as unknown as 'type' moment operations.push(contents.default as unknown as IGeneralOperation); } diff --git a/api/routes/sharp/v2/services/TextManager.ts b/api/src/routes/sharp/v2/services/TextManager.ts similarity index 100% rename from api/routes/sharp/v2/services/TextManager.ts rename to api/src/routes/sharp/v2/services/TextManager.ts diff --git a/api/src/routes/sharp/v2/validateInput.ts b/api/src/routes/sharp/v2/validateInput.ts new file mode 100644 index 0000000..b662aa4 --- /dev/null +++ b/api/src/routes/sharp/v2/validateInput.ts @@ -0,0 +1,95 @@ +import { Type } from '@sinclair/typebox'; +import { Value } from '@sinclair/typebox/value'; + +import { mapping } from '../v1/mapBody/mapping/index.js'; + +export interface ValidInputObject { + background: string; + cacheDuration?: number; + operations: JObject[]; +} + +// Aliases on base object or +const propertyAliases = { + bg: 'background', + h: 'height', + w: 'width', + t: 'type', + d: 'data', + // txt: 'text', + // o: 'opacity', + // r: 'rotate', + // s: 'shape', + align: 'alignment', + // children: 'images', + ops: 'operations' +}; + +/* const imageMapping = mapping.object({ + background: mapping.string.optional, + x: mapping.number.optional, + y: mapping.number.optional, + alignment: mapping.string.optional, + size: mapping.string.optional, + blendMode: mapping.string.optional +}); */ + +// const inputObjectMapping = mapping.object({ +// background: mapping.string.optional, +// cacheDuration: mapping.number.optional, +// responseType: mapping.string.optional, +// operations: mapping.array(mapping.unknown).optional +// }); + +const RootInputBox = Type.Object({ + background: Type.Optional(Type.String()), + cacheDuration: Type.Optional(Type.Number()), + responseType: Type.Optional(Type.Union([ + Type.Literal('image'), + Type.Literal('link') + ])), + operations: Type.Optional(Type.Array(Type.Unknown())) +}); + +export function validateRootInput(input: JObject): ValidInputObject | undefined { + convertAliases(input); + + try { + const rootImageInput = Value.Parse(RootInputBox, input); + const operations = []; + + if ('operations' in rootImageInput && Array.isArray(rootImageInput.operations)) { + for (const element of rootImageInput.operations) { + if (!Value.Check(Type.Object({}, { additionalProperties: true }), element)) + operations.push(generateInvalidOperation(element)); + else + operations.push(convertAliases(element)); + } + } + return { background: rootImageInput.background ?? '', operations }; + } catch (_: unknown) { + return; + } +} + +function convertAliases(input: JObject): JObject { + for (const key of Object.keys(input)) + if (key in propertyAliases) { + input[propertyAliases[key as keyof typeof propertyAliases]] = input[key]; + delete input[key]; + } + return input; +} + +function generateInvalidOperation(operation: unknown): JObject { + const mappedJtoken = mapping.jToken(operation); + if (mappedJtoken.valid) + return { + type: 'invalid_operation', + data: mappedJtoken.value + }; + return { + type: 'invalid_operation', + data: 'undefined' + }; +} diff --git a/api/src/types/Config.ts b/api/src/types/Config.ts new file mode 100644 index 0000000..18f5016 --- /dev/null +++ b/api/src/types/Config.ts @@ -0,0 +1,13 @@ +import { Static, Type } from '@sinclair/typebox'; + +export const ConfigSchema = Type.Object({ + discord: Type.Object({ + token: Type.String(), + logChannel: Type.String() + }), + beta: Type.Boolean(), + port: Type.Number(), + persistKey: Type.String() +}); + +export type Config = Static; diff --git a/api/types/ImageTypes.ts b/api/src/types/ImageTypes.ts similarity index 100% rename from api/types/ImageTypes.ts rename to api/src/types/ImageTypes.ts diff --git a/api/types/PayloadTypes.ts b/api/src/types/PayloadTypes.ts similarity index 100% rename from api/types/PayloadTypes.ts rename to api/src/types/PayloadTypes.ts diff --git a/api/types/definitions/global.d.ts b/api/src/types/definitions/global.d.ts similarity index 100% rename from api/types/definitions/global.d.ts rename to api/src/types/definitions/global.d.ts diff --git a/api/utils/CacheManager.ts b/api/src/utils/CacheManager.ts similarity index 100% rename from api/utils/CacheManager.ts rename to api/src/utils/CacheManager.ts diff --git a/api/utils/HttpException.ts b/api/src/utils/HttpException.ts similarity index 100% rename from api/utils/HttpException.ts rename to api/src/utils/HttpException.ts diff --git a/api/utils/Timer.ts b/api/src/utils/Timer.ts similarity index 93% rename from api/utils/Timer.ts rename to api/src/utils/Timer.ts index 28a53a8..d98b384 100644 --- a/api/utils/Timer.ts +++ b/api/src/utils/Timer.ts @@ -5,6 +5,11 @@ import { hrtime } from 'node:process'; export default class Timer { private startTime?: bigint; private stopTime?: bigint; + + /** + * + * @param start Starts timer by default + */ public constructor(start = true) { if (start) this.start(); diff --git a/api/utils/env/createEnv.ts b/api/src/utils/env/createEnv.ts similarity index 100% rename from api/utils/env/createEnv.ts rename to api/src/utils/env/createEnv.ts diff --git a/api/utils/env/validateEnv.ts b/api/src/utils/env/validateEnv.ts similarity index 100% rename from api/utils/env/validateEnv.ts rename to api/src/utils/env/validateEnv.ts diff --git a/api/utils/guard/hasProperty.ts b/api/src/utils/guard/hasProperty.ts similarity index 100% rename from api/utils/guard/hasProperty.ts rename to api/src/utils/guard/hasProperty.ts diff --git a/api/utils/guard/hasValue.ts b/api/src/utils/guard/hasValue.ts similarity index 100% rename from api/utils/guard/hasValue.ts rename to api/src/utils/guard/hasValue.ts diff --git a/api/utils/guard/index.ts b/api/src/utils/guard/index.ts similarity index 100% rename from api/utils/guard/index.ts rename to api/src/utils/guard/index.ts diff --git a/api/utils/index.ts b/api/src/utils/index.ts similarity index 69% rename from api/utils/index.ts rename to api/src/utils/index.ts index 58efd48..feac06a 100644 --- a/api/utils/index.ts +++ b/api/src/utils/index.ts @@ -1,4 +1,4 @@ -export * as mapping from './mapping/index.js'; +export * as mapping from '../routes/sharp/v1/mapBody/mapping/index.js'; export function isErrnoException(e: unknown): e is NodeJS.ErrnoException { if (e instanceof Error) diff --git a/api/src/utils/loadConfig.ts b/api/src/utils/loadConfig.ts new file mode 100644 index 0000000..48d5bb4 --- /dev/null +++ b/api/src/utils/loadConfig.ts @@ -0,0 +1,29 @@ +/* eslint-disable no-console */ +import { Value } from '@sinclair/typebox/value'; + +import { fileURLToPath } from 'url'; +import path from 'path'; + +import { Config, ConfigSchema } from '../types/Config.js'; + +const configPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', '..', 'config.json'); + +export default async function getConfig(): Promise { + const config = await import(configPath, { with: { type: 'json' } }).then((contents) => { + return contents.default ?? {}; + }).catch((err) => { + throw err; + }); + + if (!Value.Check(ConfigSchema, config)) { + const errors = [...Value.Errors(ConfigSchema, config)] + .map((error) => { + return addSpaceIfPath(error.path) + error.message; + }); + console.log(config); + throw Error('Invalid config file:\n' + errors.join('\n')); + } + return config; +}; + +const addSpaceIfPath = (path: string): string => path !== '' ? path + ' ' : ''; diff --git a/api/utils/logging/NiceLogger.ts b/api/src/utils/logging/NiceLogger.ts similarity index 100% rename from api/utils/logging/NiceLogger.ts rename to api/src/utils/logging/NiceLogger.ts diff --git a/api/utils/logging/WinstonLogger.ts b/api/src/utils/logging/WinstonLogger.ts similarity index 100% rename from api/utils/logging/WinstonLogger.ts rename to api/src/utils/logging/WinstonLogger.ts diff --git a/api/utils/types.ts b/api/src/utils/types.ts similarity index 100% rename from api/utils/types.ts rename to api/src/utils/types.ts diff --git a/api/tsconfig.json b/api/tsconfig.json index bcb6dc5..446ebbd 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -20,8 +20,20 @@ "allowUnusedLabels": false, "moduleResolution": "Node", "types": [], - "lib": ["ES2021"], + "lib": [ + "ES2021" + ], + "rootDir": "./src", "baseUrl": "./", - "skipLibCheck": true - } -} + "outDir": "out", + "skipLibCheck": true, + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "**/*.disabled", + "node_modules", + "out" + ] +} \ No newline at end of file diff --git a/api/types/Config.ts b/api/types/Config.ts deleted file mode 100644 index d885f2c..0000000 --- a/api/types/Config.ts +++ /dev/null @@ -1,13 +0,0 @@ -export interface Config { - discord: { - token: string; - logChannel: string; - }; - postgres: { - user: string; - db: string; - password: string; - }; - beta: boolean; - port: number; -} diff --git a/api/types/index.ts b/api/types/index.ts deleted file mode 100644 index 5214ee0..0000000 --- a/api/types/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './Config.js'; -export * from './ImageTypes.js'; -export * from './PayloadTypes.js'; diff --git a/api/yarn.lock b/api/yarn.lock index a5c3da0..01f7004 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -500,6 +500,11 @@ dependencies: "@prisma/debug" "5.10.2" +"@sinclair/typebox@^0.33.12": + version "0.33.12" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.33.12.tgz#1feac782bc50dc02733ad3d63964035dd3fe8ba7" + integrity sha512-d5KrXIdPolLp8VpGpZAQvEz8ioVtFlUQSyCIS2sEBi7FKhceIB7nj9BlNfqqvp5wmOfg8v8bP1rAvYYkjz21/Q== + "@stylistic/eslint-plugin-ts@^2.8.0": version "2.8.0" resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.8.0.tgz#b45029af65ecfa7cc28ff42238d55c0f55f7dbf8" @@ -566,10 +571,10 @@ dependencies: "@types/color-convert" "*" -"@types/config@^3.3.0": - version "3.3.3" - resolved "https://registry.yarnpkg.com/@types/config/-/config-3.3.3.tgz#3e9e286365bd02f8ca079898a14172df47010941" - integrity sha512-BB8DBAud88EgiAKlz8WQStzI771Kb6F3j4dioRJ4GD+tP4tzcZyMlz86aXuZT4s9hyesFORehMQE6eqtA5O+Vg== +"@types/config@^3.3.5": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@types/config/-/config-3.3.5.tgz#91f0a52b10212b9c4254fb0bbc4bedd77cd389b8" + integrity sha512-itq2HtXQBrNUKwMNZnb9mBRE3T99VYCdl1gjST9rq+9kFaB1iMMGuDeZnP88qid73DnpAMKH9ZolqDpS1Lz7+w== "@types/connect@*": version "3.4.38" @@ -988,10 +993,10 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== +body-parser@1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== dependencies: bytes "3.1.2" content-type "~1.0.5" @@ -1001,7 +1006,7 @@ body-parser@1.20.2: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.11.0" + qs "6.13.0" raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -1259,10 +1264,10 @@ confbox@^0.1.7: resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579" integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA== -config@^3.3.8: - version "3.3.11" - resolved "https://registry.yarnpkg.com/config/-/config-3.3.11.tgz#009e802631363e456d4cf57767a65c1549069ba2" - integrity sha512-Dhn63ZoWCW5EMg4P0Sl/XNsj/7RLiUIA1x1npCy+m2cRwRHzLnt3UtYtxRDMZW/6oOMdWhCzaGYkOcajGgrAOA== +config@^3.3.12: + version "3.3.12" + resolved "https://registry.yarnpkg.com/config/-/config-3.3.12.tgz#a10ae66efcc3e48c1879fbb657c86c4ef6c7b25e" + integrity sha512-Vmx389R/QVM3foxqBzXO8t2tUikYZP64Q6vQxGrsMpREeJc/aWRnPRERXWsYzOHAumx/AOoILWe6nU3ZJL+6Sw== dependencies: json5 "^2.2.3" @@ -1298,12 +1303,7 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== - -cookie@^0.6.0: +cookie@0.6.0, cookie@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== @@ -1427,7 +1427,7 @@ defu@^6.1.4: resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479" integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg== -del-cli@^5.0.0: +del-cli@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-5.1.0.tgz#740eca1c7a9eb13043e68d8a361cf0ff9a18d5c8" integrity sha512-xwMeh2acluWeccsfzE7VLsG3yTr7nWikbfw+xhMnpRrF15pGSkw+3/vJZWlGoE4I86UiLRNHicmKt4tkIX9Jtg== @@ -1533,6 +1533,11 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== +encodeurl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" + integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== + envalid@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/envalid/-/envalid-7.3.1.tgz#5bf6bbb4effab2d64a1991d8078b4ae38924f0d2" @@ -1754,37 +1759,37 @@ events@^3.3.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -express@^4.18.2: - version "4.18.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.3.tgz#6870746f3ff904dee1819b82e4b51509afffb0d4" - integrity sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw== +express@^4.21.0: + version "4.21.0" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" + integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.2" + body-parser "1.20.3" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.5.0" + cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.2.0" + finalhandler "1.3.1" fresh "0.5.2" http-errors "2.0.0" - merge-descriptors "1.0.1" + merge-descriptors "1.0.3" methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.7" + path-to-regexp "0.1.10" proxy-addr "~2.0.7" - qs "6.11.0" + qs "6.13.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" + send "0.19.0" + serve-static "1.16.2" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -1929,13 +1934,13 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== dependencies: debug "2.6.9" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" on-finished "2.4.1" parseurl "~1.3.3" @@ -2610,10 +2615,10 @@ meow@^10.1.3: type-fest "^1.2.2" yargs-parser "^20.2.9" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== +merge-descriptors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" + integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" @@ -2998,10 +3003,10 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" + integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== path-type@^4.0.0: version "4.0.0" @@ -3244,12 +3249,12 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== +qs@6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== dependencies: - side-channel "^1.0.4" + side-channel "^1.0.6" queue-microtask@^1.2.2: version "1.2.3" @@ -3471,10 +3476,10 @@ semver@^7.6.0, semver@^7.6.3: resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== +send@0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" + integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== dependencies: debug "2.6.9" depd "2.0.0" @@ -3490,15 +3495,15 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== dependencies: - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.18.0" + send "0.19.0" set-blocking@^2.0.0: version "2.0.0" @@ -3568,7 +3573,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -side-channel@^1.0.4: +side-channel@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== @@ -3857,10 +3862,10 @@ typescript-eslint@^8.6.0: "@typescript-eslint/parser" "8.6.0" "@typescript-eslint/utils" "8.6.0" -typescript@^5.4.0: - version "5.4.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" - integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ== +typescript@^5.6.2: + version "5.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0" + integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw== ufo@^1.5.3: version "1.5.4" From 102e2beafbcfb298b0b6f83ecb6553d4455ae835 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Mon, 23 Sep 2024 20:58:11 +0200 Subject: [PATCH 12/24] Eslint tweaks --- .vscode/settings.json | 9 +++++---- api/eslint.config.mjs | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 18b9b68..2a9cc8a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,8 +8,9 @@ "editor.codeActionsOnSave": { "source.fixAll.eslint": "explicit" }, + "eslint.format.enable": true, + "editor.defaultFormatter": "dbaeumer.vscode-eslint", "eslint.useFlatConfig": true, - "editor.defaultFormatter": "vscode.typescript-language-features", "npm.packageManager": "yarn", "files.eol": "\n", "typescript.preferences.importModuleSpecifier": "relative", @@ -19,13 +20,13 @@ "editor.unicodeHighlight.invisibleCharacters": false, "editor.wordWrap": "off" }, - "[typescript]": { - "editor.defaultFormatter": "vscode.typescript-language-features" - }, "[shellscript]": { "editor.defaultFormatter": "shakram02.bash-beautify" }, "[jsonc]": { "editor.defaultFormatter": "vscode.json-language-features" + }, + "[typescript]": { + "editor.defaultFormatter": "dbaeumer.vscode-eslint" } } \ No newline at end of file diff --git a/api/eslint.config.mjs b/api/eslint.config.mjs index 67a867a..9d5568f 100644 --- a/api/eslint.config.mjs +++ b/api/eslint.config.mjs @@ -118,6 +118,7 @@ export default tseslint.config( '@stylistic/semi': [2, 'always'], '@stylistic/semi-spacing': 'error', '@stylistic/no-whitespace-before-property': 'error', + '@stylistic/keyword-spacing': 'error', //Typescript '@typescript-eslint/explicit-member-accessibility': 'error', '@typescript-eslint/class-literal-property-style': 'error', @@ -141,7 +142,8 @@ export default tseslint.config( argsIgnorePattern: '^_', varsIgnorePattern: '^_', caughtErrorsIgnorePattern: '^_' - }] + }], + '@typescript-eslint/no-floating-promises': 'error' } } ); From 970b2f0899f140b6d0ea504140beedf05297360d Mon Sep 17 00:00:00 2001 From: RagingLink Date: Mon, 23 Sep 2024 20:58:58 +0200 Subject: [PATCH 13/24] Fastify rewrite and typebox schemas --- api/package.json | 2 +- api/src/api.ts | 106 ++++--- api/src/routes/ProgressbarRoute.ts | 50 ++-- api/src/routes/TimezonesRoute.ts | 55 ++-- api/src/routes/sharp/Prisma.ts | 2 +- api/src/routes/sharp/SharpDiscord.ts | 2 +- api/src/routes/sharp/managers/TextManager.ts | 5 +- api/src/routes/sharp/v1/RouteSchemas.ts | 8 + api/src/routes/sharp/v1/SharpRoute.ts | 161 +++++++---- .../routes/sharp/v1/managers/ImageEditor.ts | 24 +- .../routes/sharp/v1/managers/ImageManager.ts | 15 +- .../routes/sharp/v1/managers/TextManager.ts | 40 +-- .../routes/sharp/v1/mapBody/bodyMappings.ts | 166 ++++++----- api/src/routes/sharp/v1/mapBody/index.ts | 240 +++------------- .../sharp/v1/mapBody/mapping/createMapping.ts | 104 ------- .../routes/sharp/v1/mapBody/mapping/index.ts | 54 ---- .../sharp/v1/mapBody/mapping/mapArray.ts | 20 -- .../sharp/v1/mapBody/mapping/mapBase64.ts | 15 - .../sharp/v1/mapBody/mapping/mapBigInt.ts | 17 -- .../sharp/v1/mapBody/mapping/mapBoolean.ts | 8 - .../sharp/v1/mapBody/mapping/mapChoice.ts | 14 - .../sharp/v1/mapBody/mapping/mapDate.ts | 30 -- .../sharp/v1/mapBody/mapping/mapDuration.ts | 24 -- .../sharp/v1/mapBody/mapping/mapFake.ts | 6 - .../sharp/v1/mapBody/mapping/mapGuard.ts | 11 - .../routes/sharp/v1/mapBody/mapping/mapIn.ts | 15 - .../sharp/v1/mapBody/mapping/mapInstanceof.ts | 11 - .../sharp/v1/mapBody/mapping/mapJObject.ts | 19 -- .../sharp/v1/mapBody/mapping/mapJToken.ts | 16 -- .../sharp/v1/mapBody/mapping/mapJson.ts | 15 - .../sharp/v1/mapBody/mapping/mapNumber.ts | 9 - .../sharp/v1/mapBody/mapping/mapObject.ts | 47 --- .../sharp/v1/mapBody/mapping/mapRecord.ts | 19 -- .../sharp/v1/mapBody/mapping/mapRegex.ts | 11 - .../sharp/v1/mapBody/mapping/mapString.ts | 13 - .../sharp/v1/mapBody/mapping/mapTuple.ts | 27 -- .../sharp/v1/mapBody/mapping/mapTypeof.ts | 21 -- .../sharp/v1/mapBody/mapping/mapUnknown.ts | 5 - .../routes/sharp/v1/mapBody/mapping/result.ts | 10 - .../routes/sharp/v1/mapBody/mapping/types.ts | 19 -- api/src/routes/sharp/v2/Image.ts | 10 +- api/src/routes/sharp/v2/SharpRoute.ts | 56 ++-- .../routes/sharp/v2/services/ImageEditor.ts | 3 +- .../routes/sharp/v2/services/ImageManager.ts | 3 +- .../sharp/v2/services/OperationHandler.ts | 11 +- .../routes/sharp/v2/services/TextManager.ts | 5 +- api/src/routes/sharp/v2/validateInput.ts | 20 +- api/src/types/ImageTypes.ts | 5 +- api/src/types/definitions/global.d.ts | 83 ------ api/src/utils/constants/MimeTypes.ts | 23 ++ api/src/utils/env/createEnv.ts | 8 - api/src/utils/env/parseEnv.ts | 20 ++ api/src/utils/env/validateEnv.ts | 9 - .../utils/{index.ts => isErrnoException.ts} | 2 - api/src/utils/loadConfig.ts | 27 +- api/src/utils/typebox/index.ts | 14 + api/yarn.lock | 267 +++++++++--------- docker-compose.yml | 1 + 58 files changed, 691 insertions(+), 1312 deletions(-) create mode 100644 api/src/routes/sharp/v1/RouteSchemas.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/createMapping.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/index.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapArray.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapBase64.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapBigInt.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapBoolean.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapChoice.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapDate.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapDuration.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapFake.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapGuard.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapIn.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapInstanceof.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapJObject.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapJToken.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapJson.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapNumber.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapObject.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapRecord.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapRegex.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapString.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapTuple.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapTypeof.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/mapUnknown.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/result.ts delete mode 100644 api/src/routes/sharp/v1/mapBody/mapping/types.ts delete mode 100644 api/src/types/definitions/global.d.ts create mode 100644 api/src/utils/constants/MimeTypes.ts delete mode 100644 api/src/utils/env/createEnv.ts create mode 100644 api/src/utils/env/parseEnv.ts delete mode 100644 api/src/utils/env/validateEnv.ts rename api/src/utils/{index.ts => isErrnoException.ts} (68%) create mode 100644 api/src/utils/typebox/index.ts diff --git a/api/package.json b/api/package.json index baacd51..4f5ee94 100644 --- a/api/package.json +++ b/api/package.json @@ -35,7 +35,7 @@ "envalid": "^7.3.1", "eris": "^0.17.1", "express": "^4.21.0", - "fastify": "^4.23.2", + "fastify": "^5.0.0", "file-type": "^18.0.0", "lodash": "^4.17.21", "mathjs": "^12.4.0", diff --git a/api/src/api.ts b/api/src/api.ts index 70fdd49..e334811 100644 --- a/api/src/api.ts +++ b/api/src/api.ts @@ -1,53 +1,73 @@ -import express, { json, NextFunction, Request, Response, urlencoded } from 'express'; - -import http from 'http'; +import Fastify, { FastifyInstance } from 'fastify'; +// import { TypeBoxTypeProvider, TypeBoxValidatorCompiler } from '@fastify/type-provider-typebox'; import ProgressBarRoute from './routes/ProgressbarRoute.js'; import SharpRoute from './routes/sharp/v1/SharpRoute.js'; import SharpRouteV2 from './routes/sharp/v2/SharpRoute.js'; import TimezonesRoute from './routes/TimezonesRoute.js'; -import env from './utils/env/createEnv.js'; -import HttpException from './utils/HttpException.js'; -import { defaultLogLevels, NiceLogger } from './utils/logging/NiceLogger.js'; -import loadConfig from './utils/loadConfig.js'; +//import HttpException from './utils/HttpException.js'; +import { DefaultLogger, defaultLogLevels, NiceLogger } from './utils/logging/NiceLogger.js'; +import { Config } from './types/Config.js'; +import { getConfig } from './utils/loadConfig.js'; +import parseEnv, { Env } from './utils/env/parseEnv.js'; -// Maybe I should make API its own class so I can more 'cleanly' expose common properties like config/env etc by just passing API to each route/module +//TODO rework logger maybe to specify log levels here and add emoji aliases for style const logger = new NiceLogger({ levels: defaultLogLevels, defaultLevel: 'verbose' }); -const app = express(); - -loadConfig().then((config) => { - app.get('/', (_, res) => { - res.redirect('https://api.nicelink.xyz/docs'); - }); - app.set('trust proxy', 1); - - app.use(urlencoded({ extended: false })); - app.use(json({ strict: false })); - - const sharpRoute = new SharpRoute(logger, env, config); - const sharpRouteV2 = new SharpRouteV2(logger); - //* Alias - app.use('/sharp/v2', sharpRouteV2.router); - app.use('/sharp/v1', sharpRoute.router); - //app.use('/jimp', sharpRoute.router); - - app.use('/misc/progressbar', new ProgressBarRoute(logger).router); - app.use('/timezones', new TimezonesRoute().router); - - app.use((err: HttpException, _: Request, res: Response, next: NextFunction): void => { - if (err.status === 400 && 'body' in err) { - if (err instanceof SyntaxError) { - logger.log.error('API', `${err.name}: ${err.message}`); - } else - logger.log.error('error', err); - return void res.status(400).send({ status: 400, message: err.message }); + +export default class API { + public readonly logger: DefaultLogger; + public config: Config; + public env: Env; + public server: FastifyInstance; + + public constructor() { + this.logger = logger; + try { + this.config = getConfig(); + this.env = parseEnv(); + this.server = Fastify({ trustProxy: true }); + // ? Typebox right now seems to be having an issue with infering the type. https://github.com/fastify/fastify-type-provider-typebox/issues/167 + // .setValidatorCompiler(TypeBoxValidatorCompiler) + // .withTypeProvider(); + } catch (err: unknown) { + throw err; } - next(); - }); -}); -const server = http.createServer(app); + this.server.get('/', (_, reply) => { + //Instead of redirecting I could maybe setup a proxy to the docs since that's hosted on the same machine anyways + reply.redirect(this.env.DOCS_HOST); + }); + + this.loadRoutes().catch((err) => { + this.logger.log.error(err); + }); + } + + public async start(): Promise { + const response = await this.server.listen({ port: this.env.PORT }); + this.logger.log.info(`Listening on port: ${this.env.PORT}`, response); + } + + private async loadRoutes(): Promise { + const timezoneRoute = new TimezonesRoute(this); + this.server.register(timezoneRoute.plugin, { + prefix: '/timezones' + }); + const progressBarRoute = new ProgressBarRoute(this); + this.server.register(progressBarRoute.plugin, { + prefix: '/misc/progressbar' + }); + const sharpRoute = new SharpRoute(this); + this.server.register(sharpRoute.plugin, { + prefix: '/sharp/v1' + }); + const sharpRouteV2 = new SharpRouteV2(this); + this.server.register(sharpRouteV2.plugin, { + prefix: '/sharp/v2' + }); + } +} + +const api = new API(); -server.listen(env.PORT, () => { - logger.log.info('API', 'Listening on port', +(env.PORT ?? '')); -}); +void api.start(); diff --git a/api/src/routes/ProgressbarRoute.ts b/api/src/routes/ProgressbarRoute.ts index 82392de..736617c 100644 --- a/api/src/routes/ProgressbarRoute.ts +++ b/api/src/routes/ProgressbarRoute.ts @@ -1,33 +1,43 @@ import Color from 'color'; -import { Request, Response, Router } from 'express'; import sharp from 'sharp'; +import { Static, Type } from '@sinclair/typebox'; +import { FastifyPluginAsync, FastifyReply, FastifyRequest } from 'fastify'; import fs from 'fs'; import path from 'path'; import * as url from 'url'; import CacheManager from '../utils/CacheManager.js'; -import { DefaultLogger } from '../utils/logging/NiceLogger.js'; +import API from '../api.js'; + +const ProgressBarQuerySchema = Type.Partial(Type.Object({ + c: Type.String(), + color: Type.String(), + colour: Type.String(), + p: Type.Number(), + percentage: Type.Number() +})); export default class ProgressBarRoute { - public router = Router(); #assetsPath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', 'assets', 'img'); private readonly pillBg = fs.readFileSync(this.#assetsPath + '/1000x64_pillshape.png'); private readonly pillShape = fs.readFileSync(this.#assetsPath + '/996x60_pillshape.png'); private readonly cache: CacheManager<{ buffer: Buffer; }>; + public readonly plugin: FastifyPluginAsync; - public constructor(public readonly logger: DefaultLogger) { + public constructor(public readonly api: API) { this.cache = new CacheManager({ refresh: 6, hours: 24 * 2 }); - - this.router.get('/', (req, res) => void this.getProgressbar(req, res)); + this.plugin = async (fastify) => { + fastify.get<{ Querystring: Static }>('/', { schema: { querystring: ProgressBarQuerySchema } }, (req, reply) => this.getProgressbar(req, reply)); + }; this.cache.registerMultipleSweepHandler((items) => { if (items.length === 0) return; - this.logger.log.info('ProgressbarRoute', `Deleted ${items.length} cached bars`); + this.api.logger.log.info('ProgressbarRoute', `Deleted ${items.length} cached bars`); }); } - public getProgressbar(req: Request, res: Response): void { + public getProgressbar(req: FastifyRequest<{ Querystring: Static }>, reply: FastifyReply): void { let colour = String(req.query.c ?? req.query.color ?? req.query.colour ?? '#FFFFFF'); if (/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(colour)) colour = '#' + colour; @@ -35,23 +45,23 @@ export default class ProgressBarRoute { const percentage = toInt(req.query.p) ?? toInt(req.query.percentage) ?? NaN; if (isNaN(percentage)) - return void res.send('Invalid percentage'); + return void reply.send('Invalid percentage'); if (percentage < 0 || percentage > 100) - return void res.send('Percentage out of range'); + return void reply.send('Percentage out of range'); const pillID = `${colour}${percentage}`; const cachedPill = this.cache.get(pillID); if (cachedPill !== undefined) { - res.set('Content-Type', 'image/png'); - return void res.send(cachedPill.buffer); + reply.type('image/png'); + return void reply.send(cachedPill.buffer); } - return void this.generatePillImage(res, percentage, colour); + return void this.generatePillImage(reply, percentage, colour); } - private generatePillImage(res: Response, percentage: number, colour: string): void { + private generatePillImage(reply: FastifyReply, percentage: number, colour: string): void { try { - res.type('png'); + reply.type('png'); const rgb = new Color(colour).rgb().array(); void sharp({ create: { @@ -68,17 +78,17 @@ export default class ProgressBarRoute { void sharp(data).extract({ top: 0, left: 0, height: 60, width: Math.round(996 / 100 * percentage) }).png().toBuffer().then((pillBuffer) => { void sharp(this.pillBg).composite([{ input: pillBuffer, top: 2, left: 2 }]).toBuffer().then((buffer) => { this.cache.set(colour + percentage.toString(), { buffer }); - res.set('Content-Type', 'image/png'); - res.send(buffer); + reply.type('image/png'); + reply.send(buffer); }); }); }); } catch (e: unknown) { - this.logger.log.error('Progressbar', e); + this.api.logger.log.error('Progressbar', e); if (e instanceof Error) - res.send(e.message); + reply.send(e.message); else - res.send('Unknown error during generation'); + reply.send('Unknown error during generation'); } } } diff --git a/api/src/routes/TimezonesRoute.ts b/api/src/routes/TimezonesRoute.ts index 55c2093..5a44d1f 100644 --- a/api/src/routes/TimezonesRoute.ts +++ b/api/src/routes/TimezonesRoute.ts @@ -1,6 +1,8 @@ -import { Request, Response, Router } from 'express'; import { Static, Type } from '@sinclair/typebox'; import { Value } from '@sinclair/typebox/value'; +import { FastifyPluginCallback, FastifyReply, FastifyRequest } from 'fastify'; + +import API from '../api.js'; const singleTimezoneSchema = Type.Object({ value: Type.String(), @@ -12,33 +14,50 @@ const singleTimezoneSchema = Type.Object({ }); const timezonesArraySchema = Type.Array(singleTimezoneSchema); +const TimezoneRequestQuerySchema = Type.Object({ + q: Type.Optional(Type.String()) +}); + export default class TimezonesRoute { - public readonly router = Router(); private simpleTimezones: string[] = []; + public plugin: FastifyPluginCallback; #timezones: Static = []; - public constructor() { - import('../../assets/data/timezones.json', { with: { type: 'json' } }).then((data) => { - if(!Value.Check(timezonesArraySchema, data)) - return; - this.#timezones = data; - this.simpleTimezones = this.#timezones - .reduce((acc: string[], item) => { - acc.push(...item.utc); - return acc; - }, []).filter((item, index, self) => self.indexOf(item) === index); + public constructor(public readonly api: API) { + this.loadTimezonesJson().catch((err: unknown) => { + api.logger.log.error(err); }); - this.router.get('/', (req, res) => this.getTimezone(req, res)); - this.router.get('/simple', (_, res) => res.type('json').send(JSON.stringify(this.simpleTimezones, null, 2))); + this.plugin = (fastify, { }, done) => { + fastify.get<{ Querystring: Static }>('/', { + schema: { + querystring: TimezoneRequestQuerySchema + } + }, (req, reply) => { + this.getTimezone(req, reply); + }); + fastify.get('/simple', (_, reply) => reply.type('json').send(JSON.stringify(this.simpleTimezones, null, 2))); + done(); + }; } - private getTimezone(req: Request, res: Response): void { - if (req.query.q === undefined) { + private async loadTimezonesJson(): Promise { + const data = import('../../assets/data/timezones.json', { with: { type: 'json' } }); + if (!Value.Check(timezonesArraySchema, data)) + return; + this.#timezones = data; + this.simpleTimezones = this.#timezones.reduce((acc, item) => { + acc.push(...item.utc); + return acc; + }, []).filter((item, index, self) => self.indexOf(item) === index); + } + + private getTimezone(req: FastifyRequest<{ Querystring: Static }>, res: FastifyReply): void { + if (req.query.q === undefined) return void res.type('json').send(JSON.stringify(this.#timezones, null, 2)); - } - const query = String(req.query.q).toLowerCase(); + + const query = req.query.q.toLowerCase(); const timeCodes = this.simpleTimezones.filter((item) => { return item.toLowerCase().includes(query); }); diff --git a/api/src/routes/sharp/Prisma.ts b/api/src/routes/sharp/Prisma.ts index 9edc12b..addaa35 100644 --- a/api/src/routes/sharp/Prisma.ts +++ b/api/src/routes/sharp/Prisma.ts @@ -8,6 +8,6 @@ export default class Prisma { this.client = new PrismaClient(); this.client.$connect().then(() => { this.logger.log.prisma('Connected to Postgres'); - }).catch((e) => logger.log.error('Prisma', e)); + }).catch((e) => logger.log.error(e)); } } diff --git a/api/src/routes/sharp/SharpDiscord.ts b/api/src/routes/sharp/SharpDiscord.ts index 71134d6..c55582d 100644 --- a/api/src/routes/sharp/SharpDiscord.ts +++ b/api/src/routes/sharp/SharpDiscord.ts @@ -10,7 +10,7 @@ export class SharpDiscord { this.client = Eris(config.discord.token); this.client.on('ready', () => { if (Date.now() - this.discordLastDisconnect > 60000) - logger.log.info('Discord', 'Client ready'); + logger.log.info('Discord Client ready'); }); this.client.on('disconnect', () => { this.discordLastDisconnect = Date.now(); diff --git a/api/src/routes/sharp/managers/TextManager.ts b/api/src/routes/sharp/managers/TextManager.ts index 200468e..43df5e0 100644 --- a/api/src/routes/sharp/managers/TextManager.ts +++ b/api/src/routes/sharp/managers/TextManager.ts @@ -7,8 +7,9 @@ import { fileURLToPath } from 'url'; import Timer from '../../../utils/Timer.js'; import { DefaultOptions, InputOptions } from '../../../types/PayloadTypes.js'; -import { isErrnoException } from '../../../utils/index.js'; +import { isErrnoException } from '../../../utils/isErrnoException.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import { GenericRecordType } from '../../../utils/typebox/index.js'; interface Font { name: string; @@ -325,7 +326,7 @@ export default class TextManager { } } - private validateMetadata(input: JObject): { name: string; file: string; family: string; }[] { + private validateMetadata(input: GenericRecordType): { name: string; file: string; family: string; }[] { const fonts = []; if ('name' in input && typeof input.name === 'string' && 'fonts' in input) { if (!Array.isArray(input.fonts)) diff --git a/api/src/routes/sharp/v1/RouteSchemas.ts b/api/src/routes/sharp/v1/RouteSchemas.ts new file mode 100644 index 0000000..44bd131 --- /dev/null +++ b/api/src/routes/sharp/v1/RouteSchemas.ts @@ -0,0 +1,8 @@ +import { Type } from '@sinclair/typebox'; + +export const GetParamsSchema = Type.Object({ image: Type.String() }); +export const GetResponseSchema = Type.Object({ + 200: Type.Uint8Array(), + 404: Type.String(), + 500: Type.String() +}); diff --git a/api/src/routes/sharp/v1/SharpRoute.ts b/api/src/routes/sharp/v1/SharpRoute.ts index c708164..f18d7e3 100644 --- a/api/src/routes/sharp/v1/SharpRoute.ts +++ b/api/src/routes/sharp/v1/SharpRoute.ts @@ -1,97 +1,137 @@ import chalk from 'chalk'; -import { Request, Response, Router } from 'express'; +import { FastifyPluginAsync, FastifyReply, FastifyRequest } from 'fastify'; +import { Static } from '@sinclair/typebox'; + +import { PassThrough } from 'stream'; import { ImageEditor } from './managers/ImageEditor.js'; import { ImageManager } from './managers/ImageManager.js'; import TextManager from './managers/TextManager.js'; +import { GetParamsSchema, GetResponseSchema } from './RouteSchemas.js'; -import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from '../../../utils/Timer.js'; import { SharpDiscord } from '../SharpDiscord.js'; -import { Config } from '../../../types/Config.js'; +import API from '../../../api.js'; +import { GenericRecord, GenericRecordType } from '../../../utils/typebox/index.js'; +import { getMimeType } from '../../../utils/constants/MimeTypes.js'; export default class SharpRoute { + public readonly logger: API['logger']; + private readonly textManager: TextManager; private readonly imageEditor: ImageEditor; private readonly imageManager: ImageManager; private getRequestCount = 0; - public readonly router: Router; - public constructor(public readonly logger: DefaultLogger, public readonly env: NodeJS.ProcessEnv, public readonly config: Config) { - this.router = Router(); + public readonly plugin: FastifyPluginAsync; - this.textManager = new TextManager(logger); - this.imageEditor = new ImageEditor(logger, this.textManager); - this.imageManager = new ImageManager(this.imageEditor, logger); + public constructor(public readonly api: API) { + this.logger = api.logger; + this.textManager = new TextManager(this.logger); + this.imageEditor = new ImageEditor(this.logger, this.textManager); + this.imageManager = new ImageManager(this.imageEditor, this.logger); - new SharpDiscord(logger, config); + new SharpDiscord(this.logger, api.config); + + this.plugin = this.setupPlugin(); - this.router.get('*', (_, __, next) => { - this.getRequestCount++; - next(); - }); setInterval(() => { if (this.getRequestCount === 0) return; this.logger.log.endpoint('GET', chalk.whiteBright('/sharp'), `${this.getRequestCount} request last hour`); this.getRequestCount = 0; }, 3600 * 1000); - this.router.post('*', (req, res, next) => { - const timer = new Timer(); - res.once('close', () => { - this.logger.log.endpoint('POST', chalk.whiteBright('/sharp' + req.path), timer.elapsedBlueStr); - }); - next(); - }); + //* Endpoints - this.router.get('/transparent.png', (_, res) => { - void this.imageEditor.generateImage({}).then((output) => { - res.contentType('png'); - res.send(output.image.buffer); + + } + + private setupPlugin(): FastifyPluginAsync { + return async (fastify, _) => { + fastify.get('*', () => { + this.getRequestCount++; }); - }); - this.router.get('/fonts', (_, res) => { - res.type('json').send(JSON.stringify(this.textManager.availableFontFamilies, null, 2)); - }); - this.router.get('/:image', (req, res) => this.getImage(req, res)); - this.router.post('/', (req, res) => { - void this.imageEditor.generateImage((req.body as JObject)).then((output) => { - res.type('json').send(JSON.stringify(output.meta, null, 2)); + fastify.post('*', (req, reply) => { + const timer = new Timer(); + reply.then(() => { + this.logger.log.endpoint('POST', chalk.whiteBright('/sharp' + req.originalUrl.split('/').slice(-1)), timer.elapsedBlueStr); + }, () => { + this.logger.log.endpoint('POST', chalk.whiteBright('/sharp' + req.originalUrl.split('/').slice(-1)), timer.elapsedBlueStr); + }); }); - }); - //? Process multiple images and return an array of objects with errors, path, root etc. - this.router.post('/multiple', (req, res) => void this.storeMultiple(req, res)); - //? Process a request and return an object with errors, path, root etc. - this.router.post('/store', (req, res) => this.storeImage(req, res)); - //? Process a request and return an image or error object - this.router.post('/process', (req, res) => this.processImage(req, res)); + fastify.get('/transparent.png', (_, reply) => { + reply.type('png'); + reply.send(this.imageEditor); + }); + fastify.get('/fonts', (_, reply) => { + reply.type('json'); + return this.textManager.availableFontFamilies; + }); + + fastify.get + <{ Params: Static, Reply: Static }> + ('/:image', { + schema: { + params: GetParamsSchema + } + }, (req, res) => this.getImage(req, res)); + + fastify.post<{ Body: GenericRecordType }>('/', { + schema: { + body: GenericRecord + } + }, (req, res) => { + void this.imageEditor.generateImage(req.body).then((output) => { + res.type('json').send(JSON.stringify(output.meta, null, 2)); + }); + }); + + //? Process multiple images and return an array of objects with errors, path, root etc. + fastify.post('/multiple', (req, res) => void this.storeMultiple(req, res)); + + //? Process a request and return an object with errors, path, root etc. + fastify.post<{ Body: GenericRecordType }>('/store', { + schema: { + body: GenericRecord + } + }, (req, res) => this.storeImage(req, res)); + + //? Process a request and return an image or error object + fastify.post<{ Body: GenericRecordType }>('/process', { + schema: { + body: GenericRecord + } + }, (req, res) => this.processImage(req, res)); + }; } // Get image from db - private getImage(req: Request, res: Response): void { + private getImage(req: FastifyRequest<{ Params: Static }>, reply: FastifyReply<{ Reply: Static }>): void { try { void this.imageManager.getImage(req.params.image).then((buffer) => { if (buffer === undefined) { - res.send(`${req.params.image} doesn't exist.`); + reply.code(404).send(req.params.image + ' not found.'); } else { - res.type(req.params.image.split('.').pop() ?? 'png'); - res.send(buffer); + const paramExtension = req.params.image.split('.').slice(-1)[0]; + const mimeType = getMimeType(paramExtension) ?? 'image/png'; + // ? Maybe just infer the image type from the image itself??? + reply.type(mimeType); + reply.code(200).send(buffer); } }); } catch (e: unknown) { - res.send('An error occurred!'); + reply.code(500).send('An error occurred!'); this.logger.log.error(e); } } // Store image - private storeImage(req: Request, res: Response): void { - const body = req.body as JObject; - const permanent = 'persistKey' in body && body.persistKey === this.config.persistKey; + private storeImage(req: FastifyRequest<{ Body: GenericRecordType }>, reply: FastifyReply): void { + const permanent = 'persistKey' in req.body && req.body.persistKey === this.api.config.persistKey; - void this.imageEditor.generateImage((req.body as JObject)).then((output) => { + void this.imageEditor.generateImage((req.body)).then((output) => { void this.imageManager.saveImage(output.image, output.body, permanent).then((fileName) => { const root = process.env.NODE_ENV !== 'dev' ? 'https://api.nicelink.xyz/sharp/' : 'http://localhost:' + (process.env.PORT ?? '') + '/sharp/'; - res.type('json').send(JSON.stringify({ + reply.type('json').send(JSON.stringify({ path: fileName, root, url: root + fileName, @@ -101,37 +141,40 @@ export default class SharpRoute { }); } - private async storeMultiple(req: Request, res: Response): Promise { + private async storeMultiple(req: FastifyRequest, reply: FastifyReply): Promise { if (!Array.isArray(req.body)) - return void res.status(400).send(JSON.stringify({ + return void reply.code(400).send(JSON.stringify({ status: 400, message: 'Body is not an array' })); const outputs = await Promise.all(req.body.map(async (imageBody) => { if (typeof imageBody !== 'object' || Array.isArray(imageBody) || imageBody === null) return; - const output = await this.imageEditor.generateImage((imageBody as JObject)); + const output = await this.imageEditor.generateImage(imageBody); const fileName = await this.imageManager.saveImage(output.image, output.body); return { path: fileName, ...output.meta }; })); - res.type('json').send(JSON.stringify(outputs, null, 2)); + reply.type('json').send(outputs); } // Send image - private processImage(req: Request, res: Response): void { - void this.imageEditor.generateImage((req.body as JObject)).then((output) => { + private processImage(req: FastifyRequest<{ Body: GenericRecordType }>, reply: FastifyReply): void { + void this.imageEditor.generateImage(req.body).then((output) => { void output.image.format().then((format) => { - res.type(format); + reply.type(format); if (output.image.edited) { - output.image.sharp.pipe(res); + const stream = new PassThrough(); + output.image.sharp.pipe(stream); + reply.send(stream); } else { - res.send(output.image.buffer); + reply.send(output.image.buffer); } }); }); } + } diff --git a/api/src/routes/sharp/v1/managers/ImageEditor.ts b/api/src/routes/sharp/v1/managers/ImageEditor.ts index 3944a5e..71054ac 100644 --- a/api/src/routes/sharp/v1/managers/ImageEditor.ts +++ b/api/src/routes/sharp/v1/managers/ImageEditor.ts @@ -12,7 +12,9 @@ import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; import mapBody from '../mapBody/index.js'; import { MetaBody, OutputBody } from '../../../../types/ImageTypes.js'; -import { AlignmentModes, ChildBody, InputBody, TextBody } from '../../../../types/PayloadTypes.js'; +import { BodyType, ChildType, TextType } from '../mapBody/bodyMappings.js'; +import { GenericObjectType } from '../../../../utils/typebox/index.js'; +import { AlignmentModes, TextBody } from '../../../../types/PayloadTypes.js'; interface SizeObject { width: number; @@ -26,17 +28,20 @@ export class ImageEditor { private readonly imageFetcher: ImageFetcher; private readonly cache: CacheManager<{ buffer: Buffer; - inputBody?: InputBody; + inputBody?: BodyType; meta?: MetaBody; }>; + public defaultImage: Buffer; + public constructor(public readonly logger: DefaultLogger, public readonly textManager: TextManager) { this.imageFetcher = new ImageFetcher(logger, 100000); + this.defaultImage = this.imageFetcher.defaultImageBuffer; //? Refresh every half hour and keep edited images cached for 6 hours this.cache = new CacheManager({ hours: 6, refresh: 0.5 }); } - public async generateImage(inputBody: JObject): Promise { + public async generateImage(inputBody: GenericObjectType = {}): Promise { const timer = new Timer(); const meta: MetaBody = { errors: [], @@ -65,7 +70,7 @@ export class ImageEditor { }; } - public async fetchImage(src = '', inputBody: InputBody, meta: MetaBody): Promise { + public async fetchImage(src = '', inputBody: BodyType, meta: MetaBody): Promise { try { const cachedBuffer = this.cache.get(this.getBodyStr(inputBody)); const buffer = cachedBuffer?.buffer ?? @@ -78,7 +83,7 @@ export class ImageEditor { } } - public async editImage(image: Image, body: InputBody, meta: MetaBody, timer?: Timer): Promise { + public async editImage(image: Image, body: BodyType, meta: MetaBody, timer?: Timer): Promise { let resized = false; const compositeOptions: OverlayOptions[] = []; @@ -110,7 +115,8 @@ export class ImageEditor { } case 'text': { if (body.text !== undefined) - image.sharp.composite(await this.addTextImages(image, body.text)); + image.sharp.composite(await this.addTextImages(image, Array.isArray(body.text) ? body.text : [body.text])); + break; } case 'images': { @@ -192,7 +198,7 @@ export class ImageEditor { }]); } - private async addTextImages(image: Image, textObjects: TextBody[]): Promise { + private async addTextImages(image: Image, textObjects: TextType[]): Promise { const textArray: { buffer: Buffer; body: TextBody; }[] = []; for (const textObject of textObjects) { const textObjectMaxWidth = { ...textObject, maxWidth: textObject.maxWidth ?? image.width }; @@ -237,7 +243,7 @@ export class ImageEditor { return overlayOptions; } - private async addChildImages(image: Image, childObjects: ChildBody[], meta: MetaBody): Promise { + private async addChildImages(image: Image, childObjects: ChildType[], meta: MetaBody): Promise { const childArray: OverlayOptions[] = []; for (const childObject of childObjects) { meta.children[meta.children.length] = { @@ -418,7 +424,7 @@ export class ImageEditor { } } - private getBodyStr(body: InputBody | TextBody, type?: 'text'): string { + private getBodyStr(body: BodyType | TextBody, type?: 'text'): string { const ignoreProps = { cacheDuration: undefined, alignment: undefined, x: undefined, y: undefined, blendMode: undefined, size: undefined }; switch (type) { case 'text': diff --git a/api/src/routes/sharp/v1/managers/ImageManager.ts b/api/src/routes/sharp/v1/managers/ImageManager.ts index f3b2862..5a2d555 100644 --- a/api/src/routes/sharp/v1/managers/ImageManager.ts +++ b/api/src/routes/sharp/v1/managers/ImageManager.ts @@ -9,11 +9,12 @@ import { fileURLToPath } from 'url'; import Image from './Image.js'; import { ImageEditor } from './ImageEditor.js'; -import { InputBody } from '../../../../types/PayloadTypes.js'; import CacheManager from '../../../../utils/CacheManager.js'; import { guard } from '../../../../utils/guard/index.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Prisma from '../../Prisma.js'; +import { GenericObjectType } from '../../../../utils/typebox/index.js'; +import { BodyType } from '../mapBody/bodyMappings.js'; export class ImageManager { private readonly cache: CacheManager<{ buffer: Buffer; }>; @@ -39,7 +40,7 @@ export class ImageManager { return fileName; } - public async saveImage(image: Image, body?: InputBody, persist = false): Promise { + public async saveImage(image: Image, body?: BodyType, persist = false): Promise { let fileType: string; if (image.edited) { fileType = (await image.sharp.metadata()).format ?? 'png'; @@ -65,7 +66,7 @@ export class ImageManager { return fileName; } - public async saveImageToDB(fileName: string, body?: InputBody, persist = false): Promise { + public async saveImageToDB(fileName: string, body?: BodyType, persist = false): Promise { const cache_duration = body?.cacheDuration ?? 7; await this.prisma.image.create({ data: { @@ -128,7 +129,7 @@ export class ImageManager { } }); if (image !== null) { - const body = JSON.parse(image.body) as JObject; + const body = JSON.parse(image.body) as GenericObjectType; const output = await this.editor.generateImage(body); const buffer = output.image.edited ? await output.image.sharp.toBuffer() : output.image.buffer; this.cache.set(fileName, { buffer }); @@ -181,11 +182,11 @@ export class ImageManager { }; const result: string[] = []; if (deletedCount.fs > 0) - result.push(`eleted ${deletedCount.fs} images from FS`); + result.push(`Deleted ${deletedCount.fs} images from FS`); if (deletedCount.pg > 0) - result.push(`eleted ${deletedCount.pg} images from PG`); + result.push(`Deleted ${deletedCount.pg} images from PG`); if (result.length > 0) - this.logger.log.prisma('D' + result.join(' and d')); + this.logger.log.prisma(result.join('\n')); this.prisma.image.count().then(async (prismaCount) => { const files = await fs.promises.readdir(this.#storedImagesPath).catch((err) => { diff --git a/api/src/routes/sharp/v1/managers/TextManager.ts b/api/src/routes/sharp/v1/managers/TextManager.ts index c2bf90f..b2ecd2c 100644 --- a/api/src/routes/sharp/v1/managers/TextManager.ts +++ b/api/src/routes/sharp/v1/managers/TextManager.ts @@ -1,12 +1,14 @@ import can, { Canvas, CanvasRenderingContext2D, TextMetrics } from 'canvas'; import chalk from 'chalk'; import { parse } from 'pb-text-format-to-json'; +import { TypeCompiler } from '@sinclair/typebox/compiler'; +import { Type } from '@sinclair/typebox'; import fs from 'fs'; import { fileURLToPath } from 'url'; import { DefaultOptions, InputOptions } from '../../../../types/PayloadTypes.js'; -import { isErrnoException } from '../../../../utils/index.js'; +import { isErrnoException } from '../../../../utils/isErrnoException.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; @@ -30,6 +32,17 @@ interface Max { interface LineProp extends Max { line: string; } + +const fontSchema = Type.Object({ + filename: Type.String(), + full_name: Type.String() +}); + +const checkFontData = TypeCompiler.Compile(Type.Object({ + name: Type.String(), + fonts: Type.Union([fontSchema, Type.Array(fontSchema)]) +})).Check; + export default class TextManager { private readonly fonts: Map; private readonly FONTS_ASSETS_DIR = fileURLToPath(new URL('.', import.meta.url)) + '../../../../../assets/fonts/'; @@ -325,31 +338,24 @@ export default class TextManager { } } - private validateMetadata(input: JObject): { name: string; file: string; family: string; }[] { + private validateMetadata(input: unknown): { name: string; file: string; family: string; }[] { const fonts = []; - if ('name' in input && typeof input.name === 'string' && 'fonts' in input) { + if (checkFontData(input)) { if (!Array.isArray(input.fonts)) input.fonts = [input.fonts]; - if (Array.isArray(input.fonts)) { - for (const font of input.fonts) { - if (typeof font !== 'object' || font === null) - continue; - - if ('filename' in font && 'full_name' in font) - if (typeof font.filename === 'string' && typeof font.full_name === 'string') - fonts.push({ - name: font.full_name, - file: font.filename, - family: input.name - }); - } + for (const font of input.fonts) { + fonts.push({ + name: font.full_name, + file: font.filename, + family: input.name + }); } } return fonts; } - public get availableFontFamilies(): Record { + public get availableFontFamilies(): Record < string, string[] > { const familyMappedObj = [...this.fonts.values()].reduce((a: Record, font) => { if (font.family in a) { a[font.family].push(font.name); diff --git a/api/src/routes/sharp/v1/mapBody/bodyMappings.ts b/api/src/routes/sharp/v1/mapBody/bodyMappings.ts index 5ce3cce..ff8acbf 100644 --- a/api/src/routes/sharp/v1/mapBody/bodyMappings.ts +++ b/api/src/routes/sharp/v1/mapBody/bodyMappings.ts @@ -1,70 +1,98 @@ -import { mapping } from './mapping/index.js'; +import { Static, Type } from '@sinclair/typebox'; +import { TypeCompiler } from '@sinclair/typebox/compiler'; -export const body = { - cacheDuration: mapping.number.optional, - background: mapping.string.optional, - width: mapping.number.optional, - height: mapping.number.optional, - opacity: mapping.number.optional, - rotate: mapping.number.optional, - flip: mapping.in(1, 2, 3).optional, - shape: mapping.choice(mapping.in('circle')).optional, - replaceColor: mapping.object({ - target: mapping.string, - replace: mapping.string, - delta: mapping.number.optional - }).optional -}; -export const child = { - size: mapping.choice(mapping.in('contain')).optional, - mask: mapping.boolean.optional, - x: mapping.number.optional, - y: mapping.number.optional, - alignment: mapping.choice(mapping.in('top-left', 'top-middle', 'top-right', 'left', 'center', 'right', 'bot-left', 'bot-middle', 'bot-right')).optional, - blendMode: mapping.string.optional, - ...body -}; -const textBody = { - text: mapping.string.optional, - size: mapping.string.optional, - font: mapping.string.optional, - textAlign: mapping.in('left', 'center', 'right').optional, - color: mapping.string.optional, - textColor: mapping.string.optional, - backgroundColor: mapping.string.optional, - bgColor: mapping.string.optional, - lineSpacing: mapping.number.optional, - maxWidth: mapping.number.optional, - strokeWidth: mapping.number.optional, - strokeColor: mapping.string.optional, - padding: mapping.number.optional, - paddingLeft: mapping.number.optional, - paddingRight: mapping.number.optional, - paddingTop: mapping.number.optional, - paddingBottom: mapping.number.optional, - borderWidth: mapping.number.optional, - borderLeftWidth: mapping.number.optional, - borderRightWidth: mapping.number.optional, - borderBottomWidth: mapping.number.optional, - borderTopWidth: mapping.number.optional, - borderColor: mapping.string.optional, - localFontPath: mapping.string.optional, - localFontName: mapping.string.optional, - output: mapping.in('buffer', 'stream', 'dataURL', 'canvas').optional -}; -export const text = { - x: mapping.number.optional, - y: mapping.number.optional, - alignment: mapping.in('top-left', 'top-middle', 'top-right', 'left', 'center', 'right', 'bot-left', 'bot-middle', 'bot-right').optional, - ...textBody -}; -export const crop = { - width: mapping.number.optional, - height: mapping.number.optional, - x: mapping.number.optional, - y: mapping.number.optional -}; -export const resize = { - width: mapping.number.optional, - height: mapping.number.optional -}; +const alignmentSchema = Type.Union([ + Type.Literal('top-left'), + Type.Literal('top-middle'), + Type.Literal('top-right'), + Type.Literal('left'), + Type.Literal('center'), + Type.Literal('right'), + Type.Literal('bot-left'), + Type.Literal('bot-middle'), + Type.Literal('bot-right') +]); + +const textSchema = Type.Partial(Type.Object({ + text: Type.String(), + size: Type.String(), + font: Type.String(), + textAlign: Type.Union([Type.Literal('left'), Type.Literal('center'), Type.Literal('right')]), + x: Type.Number(), + y: Type.Number(), + alignment: alignmentSchema, + color: Type.String(), + textColor: Type.String(), + backgroundColor: Type.String(), + bgColor: Type.String(), + lineSpacing: Type.Number(), + maxWidth: Type.Number(), + strokeWidth: Type.Number(), + strokeColor: Type.String(), + padding: Type.Number(), + paddingLeft: Type.Number(), + paddingRight: Type.Number(), + paddingTop: Type.Number(), + paddingBottom: Type.Number(), + borderWidth: Type.Number(), + borderLeftWidth: Type.Number(), + borderRightWidth: Type.Number(), + borderBottomWidth: Type.Number(), + borderTopWidth: Type.Number(), + borderColor: Type.String(), + localFontPath: Type.String(), + localFontName: Type.String(), + output: Type.Union([Type.Literal('buffer'), Type.Literal('stream'), Type.Literal('dataURL'), Type.Literal('canvas')]) +})); + +export const bodyWithoutChild = Type.Partial(Type.Object({ + cacheDuration: Type.Number(), + background: Type.String(), + width: Type.Number(), + height: Type.Number(), + opacity: Type.Number(), + rotate: Type.Number(), + flip: Type.Union([Type.Literal(1), Type.Literal(2), Type.Literal(3)]), + shape: Type.Union([Type.Literal('circle')]), + replaceColor: Type.Object({ + target: Type.String(), + replace: Type.String(), + delta: Type.Optional(Type.Number()) + }), + crop: Type.Partial(Type.Object({ + width: Type.Number(), + height: Type.Number(), + x: Type.Number(), + y: Type.Number() + })), + resize: Type.Partial(Type.Object({ + width: Type.Number(), + height: Type.Number() + })), + text: Type.Union([Type.Array(textSchema), textSchema]) +})); + +const childSchema = Type.Partial(Type.Object({ + ...bodyWithoutChild.properties, + size: Type.Union([Type.Literal('contain')]), + mask: Type.Boolean(), + x: Type.Number(), + y: Type.Number(), + alignment: alignmentSchema, + blendMode: Type.String() +})); + +export const BodySchema = Type.Partial(Type.Object({ + ...bodyWithoutChild.properties, + images: Type.Array(childSchema) +})); + +export type BodyType = Static; + +const BodyTypeCheck = TypeCompiler.Compile(BodySchema); + +export const BodyCheck = BodyTypeCheck.Check; +export const BodyErrors = BodyTypeCheck.Errors; + +export type TextType = Static; +export type ChildType = Static; diff --git a/api/src/routes/sharp/v1/mapBody/index.ts b/api/src/routes/sharp/v1/mapBody/index.ts index 9a1ec72..a68acca 100644 --- a/api/src/routes/sharp/v1/mapBody/index.ts +++ b/api/src/routes/sharp/v1/mapBody/index.ts @@ -1,8 +1,7 @@ -import * as propertyMapping from './bodyMappings.js'; +import { BodyCheck, BodyErrors, BodyType } from './bodyMappings.js'; -import { guard } from '../../../../utils/guard/index.js'; import { MetaBody } from '../../../../types/ImageTypes.js'; -import { ChildBody, CropOption, InputBody, ResizeOption, TextBody } from '../../../../types/PayloadTypes.js'; +import { GenericArrayType, GenericObjectType, GenericRecordCheck, GenericRecordType } from '../../../../utils/typebox/index.js'; const propertyAliases = { bg: 'background', @@ -16,220 +15,45 @@ const propertyAliases = { children: 'images' }; -export default function mapBody(inputBody: JObject, meta: MetaBody, isChild = false): InputBody { - const mappedBody: InputBody = {}; - inputBody = convertAliases(inputBody); - - const keys = Object.keys(inputBody); - for (const key of keys) { - let value = inputBody[key]; - switch (key) { - case 'text': { - if (typeof value === 'object' && value !== null) { - const mappedTextBody = mapTextBody(value, meta); - mappedBody.text = mappedTextBody; - } else { - meta.errors.push('"text" is not an array or object'); - continue; - } - break; - } - case 'images': { - if (Array.isArray(value)) { - const mappedImagesBody = mapImagesBody(value, meta); - mappedBody.images = mappedImagesBody; - } - break; - } - case 'crop': { - mappedBody.crop = mapCropBody(value, meta); - break; - } - case 'resize': { - mappedBody.resize = mapResizeBody(value, meta); - break; - } - default: { - const bodyMapping = !isChild ? propertyMapping.body : propertyMapping.child; - if (!guard.hasProperty(bodyMapping, key)) { - meta.warnings.push(`"${key}" is not a valid key`); - continue; - } - let mappedValue = bodyMapping[key](value); - if (!mappedValue.valid) { - try { - if (typeof value === 'string') - value = JSON.parse(value); - mappedValue = bodyMapping[key](value); - if (mappedValue.valid) { - meta.warnings.push(`"${key}" was converted to ${typeof mappedValue.value}`); - } else { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } catch (_: unknown) { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } - createProperty(mappedBody, key, mappedValue.value); - //no-op - } - } - } - return mappedBody; -} -// Custom bodies -function mapTextBody(textArray: JObject | JArray, meta: MetaBody): TextBody[] { - if (!Array.isArray(textArray)) - textArray = [textArray]; - const mappedBody: TextBody[] = []; - - textArray.forEach((textObject, i) => { - mappedBody[i] = {}; - if (typeof textObject === 'object' && !Array.isArray(textObject) && textObject !== null) { - textObject = convertAliases(textObject); - const keys = Object.keys(textObject); - for (const key of keys) { - let value = textObject[key]; - if (!guard.hasProperty(propertyMapping.text, key)) { - meta.warnings.push(`"${key}" is not a valid key`); - continue; - } - let mappedValue = propertyMapping.text[key](value); - if (!mappedValue.valid) { - try { - if (typeof value === 'string') - value = JSON.parse(value); - mappedValue = propertyMapping.text[key](value); - if (mappedValue.valid) { - meta.warnings.push(`"${key}" was converted to ${typeof mappedValue.value}`); - } else { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } catch (_: unknown) { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } - createProperty(mappedBody[i], key, mappedValue.value); - } - } else { - meta.errors.push(`"text" element ${i} is not an object`); - } +export default function mapBody(inputBody: GenericObjectType, meta: MetaBody): BodyType { + convertAliases(inputBody); + if (BodyCheck(inputBody)) + return inputBody; + const errors = [...BodyErrors(inputBody)].map((err) => { + return err.message; }); - return mappedBody; -} -function mapCropBody(cropOption: JToken, meta: MetaBody): CropOption | undefined { - let mappedCropOption: CropOption | undefined = undefined; - if (cropOption === 'auto') - mappedCropOption = 'auto'; - else if (typeof cropOption === 'number') - mappedCropOption = cropOption; - else if (typeof cropOption === 'string') { - try { - cropOption = JSON.parse(cropOption); - if (typeof cropOption === 'number') { - meta.warnings.push('"crop" was converted to number'); - mappedCropOption = cropOption; - } - } catch (_: unknown) { - meta.errors.push('"crop" doesn\'t have the right type'); - } - } else if (typeof cropOption === 'object' && !Array.isArray(cropOption) && cropOption !== null) { - mappedCropOption = {}; - for (const key of Object.keys(cropOption)) { - if (!guard.hasProperty(propertyMapping.crop, key)) - continue; - let value = cropOption[key]; - let mappedValue = propertyMapping.crop[key](value); - if (!mappedValue.valid) { - try { - if (typeof value === 'string') - value = JSON.parse(value); - mappedValue = propertyMapping.crop[key](value); - if (mappedValue.valid) { - meta.warnings.push(`"${key}" was converted to ${typeof mappedValue.value}`); - mappedCropOption[key] = mappedValue.value; - } else { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } catch (_: unknown) { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } else { - mappedCropOption[key] = mappedValue.value; - } - } - } - return mappedCropOption; + meta.errors.push(...errors); + return {}; } -function mapImagesBody(imagesArray: JArray, meta: MetaBody): ChildBody[] { - const mappedBody: ChildBody[] = []; - imagesArray.forEach((imageObject, i) => { - mappedBody[i] = {}; - meta.children[i] = { - errors: [], - warnings: [], - children: [] - }; - if (typeof imageObject === 'object' && !Array.isArray(imageObject) && imageObject !== null) { - mappedBody[i] = mapBody(imageObject, meta.children[i], true); - } else { - meta.errors.push(`"image" element ${i} is not an object`); +/** + * Mutates input array + * @param inputBody + * @returns + */ +function convertAliases(inputBody: GenericRecordType | GenericArrayType): void { + if (Array.isArray(inputBody)) { + for (const element of inputBody) { + if (GenericRecordCheck(element)) + convertAliases(element); } - }); - return mappedBody; -} -function mapResizeBody(resizeOption: JToken, meta: MetaBody): ResizeOption | undefined { - if (typeof resizeOption !== 'object' || Array.isArray(resizeOption) || resizeOption === null) return; - const mappedObject: ResizeOption = {}; - for (const key of Object.keys(resizeOption)) { - let value = resizeOption[key]; - if (!guard.hasProperty(propertyMapping.resize, key)) { - meta.warnings.push(`"${key}" is not a valid key`); - continue; - } - let mappedValue = propertyMapping.resize[key](value); - if (!mappedValue.valid) { - try { - if (typeof value === 'string') - value = JSON.parse(value); - mappedValue = propertyMapping.resize[key](value); - if (mappedValue.valid) { - meta.warnings.push(`"${key}" was converted to ${typeof mappedValue.value}`); - } else { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } catch (_: unknown) { - meta.errors.push(`"${key}" doesn't have the right type`); - continue; - } - } - createProperty(mappedObject, key, mappedValue.value); } - return mappedObject; -} -function createProperty(mappedObject: B, key: K, value: V): void { - mappedObject[key] = value; -} -function convertAliases(inputBody: JObject): JObject { - const newInputBody: JObject = {}; const keys = Object.keys(inputBody); for (const key of keys) { - if (guard.hasProperty(propertyAliases, key) && guard.hasProperty(inputBody, propertyAliases[key])) { + if (GenericRecordCheck(inputBody[key])) + convertAliases(inputBody[key]); + if (!(key in propertyAliases)) + continue; + + const fullKey = propertyAliases[key]; + // Discards the 'alias' property in favour of the full property + if (fullKey in inputBody) { + delete inputBody[key]; continue; - } else if (guard.hasProperty(propertyAliases, key)) { - newInputBody[propertyAliases[key]] = JSON.parse(JSON.stringify(inputBody[key])); - } else { - newInputBody[key] = JSON.parse(JSON.stringify(inputBody[key])); } + inputBody[fullKey] = inputBody[key]; + + delete inputBody[key]; } - return newInputBody; } diff --git a/api/src/routes/sharp/v1/mapBody/mapping/createMapping.ts b/api/src/routes/sharp/v1/mapBody/mapping/createMapping.ts deleted file mode 100644 index 6a2c14c..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/createMapping.ts +++ /dev/null @@ -1,104 +0,0 @@ -import { result } from './result.js'; -import { NormalizedTypeMapping, TypeMapping, TypeMappingImpl, TypeMappingResult } from './types.js'; - -export function createMapping(impl: TypeMappingImpl): TypeMapping { - return createMappingCore(impl, props); -} - -function createMappingCore( - impl: TypeMappingImpl, - props: { [P in keyof TypeMapping]: TypedPropertyDescriptor[P]>; }) - : TypeMapping { - return Object.defineProperties(impl, props) as TypeMapping; -} - -function createNormalizedMapping( - mapping: TypeMappingImpl, - whenUndefined: (...args: TArgs) => TypeMappingResult, - whenNull: (...args: TArgs) => TypeMappingResult -): NormalizedTypeMapping { - return createMappingCore, TUndefined | TNull, TArgs>( - (value, ...args) => { - switch (value) { - case undefined: return whenUndefined(...args); - case null: return whenNull(...args); - default: { - const mapped = mapping(value, ...args); - if (mapped.valid === false) - return result.failed; - switch (mapped.value) { - case undefined: return whenUndefined(...args); - case null: return whenNull(...args); - default: return mapped as TypeMappingResult>; - } - } - } - }, - props - ); -} - -const props: { [P in keyof TypeMapping]: PropertyDescriptor } = { - nullable: { - configurable: true, - get: function (this: TypeMapping) { - return Object.defineProperty(this, 'nullable', { - configurable: false, - writable: false, - value: createNormalizedMapping(this, () => result.failed, () => result.null) - }).nullable; - } - }, - nullish: { - configurable: true, - get: function (this: TypeMapping) { - return Object.defineProperty(this, 'nullish', { - configurable: false, - writable: false, - value: createNormalizedMapping(this, () => result.undefined, () => result.null) - }).nullish; - } - }, - optional: { - configurable: true, - get: function (this: TypeMapping) { - return Object.defineProperty(this, 'optional', { - configurable: false, - writable: false, - value: createNormalizedMapping(this, () => result.undefined, () => result.failed) - }).optional; - } - }, - required: { - configurable: true, - get: function (this: TypeMapping) { - return Object.defineProperty(this, 'required', { - configurable: false, - writable: false, - value: createNormalizedMapping(this, () => result.failed, () => result.failed) - }).required; - } - }, - map: { - configurable: true, - value: function (this: TypeMapping, mapping: (value: T, ...args: TArgs) => R): TypeMapping { - return this.chain((v, ...args) => result.success(mapping(v, ...args))); - } - }, - chain: { - configurable: true, - value: function (this: TypeMapping, mapping: (value: T, ...args: TArgs) => TypeMappingResult): TypeMapping { - return createMapping((value, ...args) => { - const mapped = this(value, ...args); - if (!mapped.valid) - return mapped; - - try { - return mapping(mapped.value, ...args); - } catch { - return result.failed; - } - }); - } - } -}; diff --git a/api/src/routes/sharp/v1/mapBody/mapping/index.ts b/api/src/routes/sharp/v1/mapBody/mapping/index.ts deleted file mode 100644 index 7a70a52..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/index.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { mapArray } from './mapArray.js'; -import { mapBase64 } from './mapBase64.js'; -import { mapBigInt } from './mapBigInt.js'; -import { mapBoolean } from './mapBoolean.js'; -import { mapChoice } from './mapChoice.js'; -import { mapDate } from './mapDate.js'; -import { mapDuration } from './mapDuration.js'; -import { mapFake } from './mapFake.js'; -import { mapGuard } from './mapGuard.js'; -import { mapIn } from './mapIn.js'; -import { mapInstanceof } from './mapInstanceof.js'; -import { mapJObject } from './mapJObject.js'; -import { mapJson } from './mapJson.js'; -import { mapJToken } from './mapJToken.js'; -import { mapNumber } from './mapNumber.js'; -import { mapObject } from './mapObject.js'; -import { mapRecord } from './mapRecord.js'; -import { mapRegex } from './mapRegex.js'; -import { mapString } from './mapString.js'; -import { mapTuple } from './mapTuple.js'; -import { mapTypeof } from './mapTypeof.js'; -import { mapUnknown } from './mapUnknown.js'; -import { result } from './result.js'; - -export * from './types.js'; - -export const mapping = Object.seal({ - create: createMapping, - array: mapArray, - tuple: mapTuple, - base64: mapBase64, - bigInt: mapBigInt, - boolean: mapBoolean, - choice: mapChoice, - date: mapDate, - duration: mapDuration, - fake: mapFake, - guard: mapGuard, - in: mapIn, - instanceof: mapInstanceof, - typeof: mapTypeof, - jObject: mapJObject, - json: mapJson, - jToken: mapJToken, - number: mapNumber, - object: mapObject, - record: mapRecord, - regex: mapRegex, - string: mapString, - unknown: mapUnknown, - never: createMapping(() => result.failed), - ...result -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapArray.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapArray.ts deleted file mode 100644 index c6afa9e..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapArray.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping, TypeMappingImpl } from './types.js'; - -export function mapArray(mapping: TypeMappingImpl): TypeMapping { - return createMapping((value) => { - if (!Array.isArray(value)) - return result.failed; - - const mapped = []; - let i = 0; - for (const v of value) { - const m = mapping(v, i++); - if (!m.valid) - return result.failed; - mapped.push(m.value); - } - return result.success(mapped); - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapBase64.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapBase64.ts deleted file mode 100644 index 3589a1b..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapBase64.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping, TypeMappingImpl } from './types.js'; - -export function mapBase64(mapping: TypeMappingImpl): TypeMapping { - return createMapping((value) => { - if (typeof value !== 'string') - return result.failed; - try { - return mapping(Buffer.from(value, 'base64').toString('utf8')); - } catch { - return result.failed; - } - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapBigInt.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapBigInt.ts deleted file mode 100644 index edd7bf1..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapBigInt.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; - -export const mapBigInt = createMapping((value) => { - try { - switch (typeof value) { - case 'bigint': return result.success(value); - case 'string': - case 'number': return result.success(BigInt(value)); - default: return result.failed; - } - } catch (e: unknown) { - if (e instanceof RangeError) - return result.failed; - throw e; - } -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapBoolean.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapBoolean.ts deleted file mode 100644 index 6facc6d..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapBoolean.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; - -export const mapBoolean = createMapping((value) => { - return typeof value === 'boolean' ? - result.success(value) : - result.failed; -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapChoice.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapChoice.ts deleted file mode 100644 index 0289265..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapChoice.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping, TypeMappingImpl } from './types.js'; - -export function mapChoice(...mappings: { [P in keyof T]: TypeMappingImpl }): TypeMapping { - return createMapping((value) => { - for (const mapping of mappings) { - const mapped = mapping(value); - if (mapped.valid) - return mapped; - } - return result.failed; - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapDate.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapDate.ts deleted file mode 100644 index fead5d7..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapDate.ts +++ /dev/null @@ -1,30 +0,0 @@ -import moment from 'moment-timezone'; - -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export const mapDate: TypeMapping = createMapping((value) => { - switch (typeof value) { - case 'string': { - const mapped = moment(value); - if (mapped.isValid()) - return result.success(mapped.toDate()); - - return result.failed; - } - - case 'object': - if (value === null) - return result.failed; - - if (moment.isDate(value)) - return result.success(value); - - if (moment.isMoment(value)) - return result.success(value.toDate()); - //fallthrough - default: - return result.failed; - } -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapDuration.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapDuration.ts deleted file mode 100644 index 12fd945..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapDuration.ts +++ /dev/null @@ -1,24 +0,0 @@ -import momentTimezone from 'moment-timezone'; - -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -const { duration } = momentTimezone; - -export const mapDuration: TypeMapping = createMapping((value) => { - try { - switch (typeof value) { - case 'string': - case 'object': - case 'number': { - const mapped = duration(value); - if (mapped.isValid()) - return result.success(mapped); - } - } - } catch { - // NOOP - } - return result.failed; -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapFake.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapFake.ts deleted file mode 100644 index a6cd9aa..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapFake.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { result } from './result.js'; -import { TypeMappingResult } from './types.js'; - -export function mapFake(value: unknown): TypeMappingResult { - return result.success((value as T)); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapGuard.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapGuard.ts deleted file mode 100644 index 91d54ee..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapGuard.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export function mapGuard(guard: (value: unknown) => value is T): TypeMapping { - return createMapping((value) => { - if (guard(value)) - return result.success(value); - return result.failed; - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapIn.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapIn.ts deleted file mode 100644 index 16e5b05..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapIn.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export function mapIn(...values: T): TypeMapping; -export function mapIn(...values: T[]): TypeMapping; -export function mapIn(...values: T): TypeMapping { - const valueSet = new Set(values); - - return createMapping((value) => { - if (valueSet.has(value)) - return result.success((value as T[number])); - return result.failed; - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapInstanceof.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapInstanceof.ts deleted file mode 100644 index 25ede0d..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapInstanceof.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export function mapInstanceof(type: new (...args: never[]) => T): TypeMapping { - return createMapping((value) => { - return value instanceof type ? - result.success(value) : - result.failed; - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapJObject.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapJObject.ts deleted file mode 100644 index 462d43b..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapJObject.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export const mapJObject: TypeMapping = createMapping((value) => { - switch (typeof value) { - case 'object': - if (!Array.isArray(value) && value !== null) - return result.success(value as JObject); - // fallthrough - case 'bigint': - case 'boolean': - case 'function': - case 'number': - case 'string': - case 'symbol': - case 'undefined': return result.failed; - } -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapJToken.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapJToken.ts deleted file mode 100644 index 516c991..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapJToken.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export const mapJToken: TypeMapping = createMapping((value) => { - switch (typeof value) { - case 'bigint': - case 'symbol': - case 'undefined': - case 'function': return result.failed; - case 'boolean': - case 'number': - case 'object': - case 'string': return result.success(value as JToken); - } -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapJson.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapJson.ts deleted file mode 100644 index a23c533..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapJson.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping, TypeMappingImpl } from './types.js'; - -export function mapJson(mapping: TypeMappingImpl): TypeMapping { - return createMapping((value) => { - if (typeof value !== 'string') - return result.failed; - try { - return mapping(JSON.parse(value)); - } catch { - return result.failed; - } - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapNumber.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapNumber.ts deleted file mode 100644 index d539373..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapNumber.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export const mapNumber: TypeMapping = createMapping((value) => { - return typeof value === 'number' ? - result.success(value) : - result.failed; -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapObject.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapObject.ts deleted file mode 100644 index 56e1d31..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapObject.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping, TypeMappingImpl, TypeMappings } from './types.js'; - -export function mapObject(mappings: TypeMappings, options?: { initial?: () => Partial; strict: boolean; }): TypeMapping { - return createMapping((value) => { - if (value === undefined || typeof value !== 'object' || value === null) - return result.failed; - - const objValue = value as Record; - const mapped: Partial = options?.initial?.() ?? {}; - const remainingKeys = new Set(Object.keys(objValue)); - - function checkKey(resultKey: K, sourceKey: PropertyKey | undefined, mapping: TypeMappingImpl): boolean { - if (sourceKey !== undefined) - remainingKeys.delete(sourceKey); - const val = sourceKey === undefined ? undefined : objValue[sourceKey]; - const mappedProp = mapping(val); - if (!mappedProp.valid) - return false; - if (mappedProp.value as unknown !== undefined) - mapped[resultKey] = mappedProp.value; - return true; - } - - for (const resultKey of Object.keys(mappings)) { - const mapping = mappings[resultKey]; - if (!checkKey(resultKey, ...splitMapping((resultKey as keyof T), mapping))) - return result.failed; - } - - if (options?.strict !== false && remainingKeys.size > 0) - return result.failed; - - return result.success((mapped as T)); - }); -} - -function splitMapping(key: K, mapping: TypeMappings[K]): [PropertyKey | undefined, TypeMappingImpl] { - if (typeof mapping !== 'object') - return [key, mapping]; - - if (mapping.length === 1) - return [undefined, () => result.success(mapping[0])]; - - return mapping; -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapRecord.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapRecord.ts deleted file mode 100644 index 698c202..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapRecord.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping, TypeMappingImpl } from './types.js'; - -export function mapRecord(mapping: TypeMappingImpl, initial?: () => Record): TypeMapping> { - return createMapping((value) => { - if (value === undefined || typeof value !== 'object' || value === null) - return result.failed; - - const mapped: Record = initial?.() ?? {}; - for (const [key, prop] of Object.entries(value)) { - const mappedProp = mapping(prop, key); - if (!mappedProp.valid) - return result.failed; - mapped[key] = mappedProp.value; - } - return result.success(mapped); - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapRegex.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapRegex.ts deleted file mode 100644 index 6bd0357..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapRegex.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export function mapRegex(regex: RegExp): TypeMapping { - return createMapping((value) => { - if (typeof value === 'string' && regex.test(value)) - return result.success((value as T)); - return result.failed; - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapString.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapString.ts deleted file mode 100644 index c233376..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapString.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export const mapString: TypeMapping = createMapping((value) => { - switch (typeof value) { - case 'string': return result.success(value); - // fallthrough - case 'number': - case 'bigint': return result.success(value.toString()); - } - return result.failed; -}); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapTuple.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapTuple.ts deleted file mode 100644 index 9e23965..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapTuple.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping, TypeMappingImpl } from './types.js'; - -type TupleTypeMapping = { [P in keyof T]: TypeMappingImpl } & { length: T['length']; }; -export function mapTuple(mappings: TupleTypeMapping): TypeMapping { - return createMapping((value) => { - if (!Array.isArray(value)) - return result.failed; - - const mapped = new Array(mappings.length) as T; - - for (let i = 0; i < mappings.length; i++) { - const toMap = value[i]; - if (toMap === undefined) - return result.failed; - - const mappedItem = mappings[i](toMap); - if (!mappedItem.valid) - return result.failed; - - mapped[i] = mappedItem.value; - } - - return result.success(mapped); - }); -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapTypeof.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapTypeof.ts deleted file mode 100644 index 797e212..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapTypeof.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export function mapTypeof(typeofStr: T): TypeMapping { - return createMapping((v) => { - if (v === undefined || v === null || typeof v !== typeofStr) - return result.failed; - return result.success(v as TypeofMapping[T]); - }); -} - -export interface TypeofMapping { - 'string': string; - 'number': number; - 'boolean': boolean; - 'bigint': bigint; - 'symbol': symbol; - 'object': object; - 'function': Function; -} diff --git a/api/src/routes/sharp/v1/mapBody/mapping/mapUnknown.ts b/api/src/routes/sharp/v1/mapBody/mapping/mapUnknown.ts deleted file mode 100644 index f9014fe..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/mapUnknown.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { createMapping } from './createMapping.js'; -import { result } from './result.js'; -import { TypeMapping } from './types.js'; - -export const mapUnknown: TypeMapping = createMapping((value) => result.success(value)); diff --git a/api/src/routes/sharp/v1/mapBody/mapping/result.ts b/api/src/routes/sharp/v1/mapBody/mapping/result.ts deleted file mode 100644 index 0833815..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/result.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { TypeMappingResult } from './types.js'; - -export const result = { - failed: { valid: false } as TypeMappingResult, - undefined: { valid: true, value: undefined } as TypeMappingResult, - null: { valid: true, value: null } as TypeMappingResult, - success(value: T): TypeMappingResult { - return { valid: true, value }; - } -} as const; diff --git a/api/src/routes/sharp/v1/mapBody/mapping/types.ts b/api/src/routes/sharp/v1/mapBody/mapping/types.ts deleted file mode 100644 index e98f2c5..0000000 --- a/api/src/routes/sharp/v1/mapBody/mapping/types.ts +++ /dev/null @@ -1,19 +0,0 @@ -export type TypeMappingResult = { readonly valid: false; } | { readonly valid: true; readonly value: T; }; -export type NormalizedTypeMapping = TypeMapping | TUnion, TArgs>; -export type TypeMappingImpl = (value: unknown, ...args: TArgs) => TypeMappingResult; - -export interface TypeMapping extends TypeMappingImpl { - readonly required: NormalizedTypeMapping; - readonly optional: NormalizedTypeMapping; - readonly nullable: NormalizedTypeMapping; - readonly nullish: NormalizedTypeMapping; - map(mapping: (value: T, ...args: TArgs) => R): TypeMapping; - chain(mapping: (value: T, ...args: TArgs) => TypeMappingResult): TypeMapping; -} - -export type TypeMappings = { - readonly [P in keyof T]-?: - | TypeMappingImpl - | [PropertyKey, TypeMappingImpl] - | [T[P]] -}; diff --git a/api/src/routes/sharp/v2/Image.ts b/api/src/routes/sharp/v2/Image.ts index 30cbe71..ccc72ee 100644 --- a/api/src/routes/sharp/v2/Image.ts +++ b/api/src/routes/sharp/v2/Image.ts @@ -5,6 +5,7 @@ import { v4 as uuidv4 } from 'uuid'; import Context from './Context.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; +import { getMimeType } from '../../../utils/constants/MimeTypes.js'; export default class Image { public readonly context: Context; @@ -76,8 +77,13 @@ export default class Image { return buffer; } - public async getFormat(defaultFormat = 'png'): Promise { - return (await this.#sharp.metadata()).format ?? defaultFormat; + public async getFormat(): Promise { + return (await this.#sharp.metadata()).format ?? ''; + } + + public async getMimeType(): Promise { + const imageFormat = await this.getFormat(); + return getMimeType(imageFormat) ?? 'image/png'; } private setDimensions(buffer: Buffer): void { diff --git a/api/src/routes/sharp/v2/SharpRoute.ts b/api/src/routes/sharp/v2/SharpRoute.ts index cea21e9..d311a10 100644 --- a/api/src/routes/sharp/v2/SharpRoute.ts +++ b/api/src/routes/sharp/v2/SharpRoute.ts @@ -1,37 +1,45 @@ -import { Router } from 'express'; +import { FastifyPluginAsync } from 'fastify'; + +import { PassThrough } from 'stream'; import ImageManager from './services/ImageManager.js'; -import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; import Timer from '../../../utils/Timer.js'; +import { GenericRecord, GenericRecordType } from '../../../utils/typebox/index.js'; +import API from '../../../api.js'; export default class SharpRoute { - public readonly router = Router(); public readonly manager: ImageManager; + public readonly logger: API['logger']; + public readonly plugin: FastifyPluginAsync; + + public constructor(public readonly api: API) { + this.manager = new ImageManager(api.logger); + this.logger = api.logger; + + this.plugin = async (fastify, _) => { + fastify.post<{ Body: GenericRecordType }>('/image', { schema: { body: GenericRecord } }, async (req, reply) => { + const body = req.body; + const timer = new Timer(true); - public constructor(public readonly logger: DefaultLogger) { - this.manager = new ImageManager(logger); - - this.router.post('/image', (req, res) => { - const body = req.body as JObject; - const timer = new Timer(true); - void this.manager.postImage(body).then(async (image) => { - this.logger.log.time('Processed image', timer.elapsedBlueStr); - timer.reset(); - switch ('responseType' in body ? body.responseType : 'image') { - case 'image': - res.type(await image.getFormat()); - image.sharp.pipe(res); - break; - default: - res.status(200).send(JSON.stringify(image.context.toJSON(), null, 2)); - break; + try { + const image = await this.manager.postImage(body); + this.logger.log.time('Processed image', timer.elapsedBlueStr); + const responseType = body.responseType ?? 'image'; + + if (responseType === 'image') { + const stream = new PassThrough(); + reply.type(await image.getMimeType()); + image.sharp.pipe(stream); + return await reply.send(stream); + } + reply.code(200).type('json').send(image.context.toJSON()); + } catch (err: unknown) { + reply.code(500).type('json').send({ message: 'Internal server error occurred' }); + this.logger.log.error(err); } }); - res.once('close', () => { - this.logger.log.time('Request handled', timer.elapsedBlueStr); - }); - }); + }; //this.router.post('/image'); // this.router.post('/', (req, res) => { // const body = req.body; diff --git a/api/src/routes/sharp/v2/services/ImageEditor.ts b/api/src/routes/sharp/v2/services/ImageEditor.ts index 865669b..9ccb823 100644 --- a/api/src/routes/sharp/v2/services/ImageEditor.ts +++ b/api/src/routes/sharp/v2/services/ImageEditor.ts @@ -8,6 +8,7 @@ import Timer from '../../../../utils/Timer.js'; import Image from '../Image.js'; import { validateRootInput } from '../validateInput.js'; import { CompletedOperationObject } from '../Context.js'; +import { GenericObjectType } from '../../../../utils/typebox/index.js'; export type CachedOperationMap = Record; export type CachedOperation = (CompletedOperationObject) & { @@ -23,7 +24,7 @@ export class ImageEditor { this.operationHandler = new OperationHandler(logger); } - public async editImage(input: JObject): Promise { + public async editImage(input: GenericObjectType): Promise { const editImageTimer = new Timer(true); const validatedInput = validateRootInput(input); diff --git a/api/src/routes/sharp/v2/services/ImageManager.ts b/api/src/routes/sharp/v2/services/ImageManager.ts index 0f0ca96..274a7e7 100644 --- a/api/src/routes/sharp/v2/services/ImageManager.ts +++ b/api/src/routes/sharp/v2/services/ImageManager.ts @@ -2,6 +2,7 @@ import { ImageEditor } from './ImageEditor.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Image from '../Image.js'; +import { GenericRecordType } from '../../../../utils/typebox/index.js'; export default class ImageManager { private readonly editor: ImageEditor; @@ -10,7 +11,7 @@ export default class ImageManager { this.editor = new ImageEditor(logger); } - public async postImage(input: JObject): Promise { + public async postImage(input: GenericRecordType): Promise { const image = await this.editor.editImage(input); return image; } diff --git a/api/src/routes/sharp/v2/services/OperationHandler.ts b/api/src/routes/sharp/v2/services/OperationHandler.ts index c436b66..48dc68f 100644 --- a/api/src/routes/sharp/v2/services/OperationHandler.ts +++ b/api/src/routes/sharp/v2/services/OperationHandler.ts @@ -13,6 +13,7 @@ import Operation, { IGeneralOperation, IOperation } from '../Operation.js'; import { ValidInputObject } from '../validateInput.js'; import OperationSummary from '../OperationSummary.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; +import { GenericRecordType } from '../../../../utils/typebox/index.js'; interface ExportObj { default: unknown; @@ -27,7 +28,7 @@ export default class OperationHandler { void this.initOperations(); } - public getOperation(context: Context, inputOperation: JObject): IOperation | undefined { + public getOperation(context: Context, inputOperation: GenericRecordType): IOperation | undefined { // Maybe remove the errors from this if (!('type' in inputOperation) || typeof inputOperation.type !== 'string') { this.logger.log.operation(chalk.red('Invalid operation object:'), chalk.red.bold(JSON.stringify(inputOperation))); @@ -46,10 +47,10 @@ export default class OperationHandler { return operation; } - public getCachedBuffer(image: Image, input: ValidInputObject): { buffer: Buffer; remainingOperations: JObject[]; } | undefined { + public getCachedBuffer(image: Image, input: ValidInputObject): { buffer: Buffer; remainingOperations: GenericRecordType[]; } | undefined { if (!(input.background in this.cache)) return; - let remainingOperations: JObject[] = input.operations; + let remainingOperations: GenericRecordType[] = input.operations; // The cached operation that it's currently using let currentOperation: CachedOperation | undefined; // The array of operations that are cached @@ -199,11 +200,11 @@ export default class OperationHandler { return unknownOperationSummary; }; - private isEqual(operation: JObject | CompletedOperationObject, cachedOperation: CachedOperation): boolean { + private isEqual(operation: GenericRecordType | CompletedOperationObject, cachedOperation: CachedOperation): boolean { return _.isEqual(this.removeCacheKeys(operation), this.removeCacheKeys(cachedOperation)); } - private removeCacheKeys(object: JObject | CachedOperation | CompletedOperationObject, include = ['type', 'data']): JObject { + private removeCacheKeys(object: GenericRecordType | CachedOperation | CompletedOperationObject, include = ['type', 'data']): GenericRecordType { return _.omit(object, Object.keys(object).filter((e) => !include.includes(e))); } } diff --git a/api/src/routes/sharp/v2/services/TextManager.ts b/api/src/routes/sharp/v2/services/TextManager.ts index d8b9ec3..93ce1c1 100644 --- a/api/src/routes/sharp/v2/services/TextManager.ts +++ b/api/src/routes/sharp/v2/services/TextManager.ts @@ -6,9 +6,10 @@ import fs from 'fs'; import { fileURLToPath } from 'url'; import { DefaultOptions, InputOptions } from '../../../../types/PayloadTypes.js'; -import { isErrnoException } from '../../../../utils/index.js'; +import { isErrnoException } from '../../../../utils/isErrnoException.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; +import { GenericRecordType } from '../../../../utils/typebox/index.js'; interface Font { name: string; @@ -326,7 +327,7 @@ export class TextManager { } } - private validateMetadata(input: JObject): { name: string; file: string; family: string; }[] { + private validateMetadata(input: GenericRecordType): { name: string; file: string; family: string; }[] { const fonts = []; if ('name' in input && typeof input.name === 'string' && 'fonts' in input) { if (!Array.isArray(input.fonts)) diff --git a/api/src/routes/sharp/v2/validateInput.ts b/api/src/routes/sharp/v2/validateInput.ts index b662aa4..d1079bb 100644 --- a/api/src/routes/sharp/v2/validateInput.ts +++ b/api/src/routes/sharp/v2/validateInput.ts @@ -1,12 +1,12 @@ import { Type } from '@sinclair/typebox'; import { Value } from '@sinclair/typebox/value'; -import { mapping } from '../v1/mapBody/mapping/index.js'; +import { GenericObjectType, GenericRecordType } from '../../../utils/typebox/index.js'; export interface ValidInputObject { background: string; cacheDuration?: number; - operations: JObject[]; + operations: GenericRecordType[]; } // Aliases on base object or @@ -47,11 +47,11 @@ const RootInputBox = Type.Object({ responseType: Type.Optional(Type.Union([ Type.Literal('image'), Type.Literal('link') - ])), + ], {})), operations: Type.Optional(Type.Array(Type.Unknown())) }); -export function validateRootInput(input: JObject): ValidInputObject | undefined { +export function validateRootInput(input: GenericObjectType): ValidInputObject | undefined { convertAliases(input); try { @@ -72,7 +72,7 @@ export function validateRootInput(input: JObject): ValidInputObject | undefined } } -function convertAliases(input: JObject): JObject { +function convertAliases(input: GenericRecordType): GenericRecordType { for (const key of Object.keys(input)) if (key in propertyAliases) { input[propertyAliases[key as keyof typeof propertyAliases]] = input[key]; @@ -81,15 +81,9 @@ function convertAliases(input: JObject): JObject { return input; } -function generateInvalidOperation(operation: unknown): JObject { - const mappedJtoken = mapping.jToken(operation); - if (mappedJtoken.valid) - return { - type: 'invalid_operation', - data: mappedJtoken.value - }; +function generateInvalidOperation(operation: unknown): GenericRecordType { return { type: 'invalid_operation', - data: 'undefined' + data: operation }; } diff --git a/api/src/types/ImageTypes.ts b/api/src/types/ImageTypes.ts index 6917521..ba22cbb 100644 --- a/api/src/types/ImageTypes.ts +++ b/api/src/types/ImageTypes.ts @@ -1,8 +1,7 @@ import sharp from 'sharp'; -import { InputBody } from './PayloadTypes.js'; - import Image from '../routes/sharp/v1/managers/Image.js'; +import { BodyType } from '../routes/sharp/v1/mapBody/bodyMappings.js'; export interface MetaBody { children: MetaBody[]; @@ -13,7 +12,7 @@ export interface MetaBody { export interface OutputBody { image: Image; meta: MetaBody; - body: InputBody; + body: BodyType; } export interface ImageOutput { diff --git a/api/src/types/definitions/global.d.ts b/api/src/types/definitions/global.d.ts deleted file mode 100644 index 0ccc19b..0000000 --- a/api/src/types/definitions/global.d.ts +++ /dev/null @@ -1,83 +0,0 @@ -import ''; - -declare global { - type Primitive = string | number | bigint | boolean | object | Function | symbol | undefined; - type JToken = { [key: string]: JToken; } | JArray | JValue | null | undefined; - type JValue = string | number | boolean; - type JObject = Record; - type JArray = JToken[]; - type JTokenType = keyof JTokenTypeMap; - interface JTokenTypeMap { - 'string': string; - 'number': number; - 'boolean': boolean; - 'undefined': undefined; - 'null': null; - 'array': JArray; - 'object': JObject; - } - - type ClassOf = (Function & { prototype: T; }) | (abstract new (...args: never) => T); - type PropertyNamesOfType = { [K in keyof T]: T[K] extends P ? K : never }[keyof T]; - type PropertiesOfType = { [K in PropertyNamesOfType]: T[K] }; - type Intersect = { [K in (keyof T1 & keyof T2)]: T1[K] extends T2[K] ? T2[K] extends T1[K] ? T1[K] : never : never }; - - type UppercaseFirst = T extends `${infer L}${infer R}` ? `${Uppercase}${R}` : T; - type LowercaseFirst = T extends `${infer L}${infer R}` ? `${Lowercase}${R}` : T; - type LowerLetter = Lowercase<'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z'>; - type UpperLetter = Uppercase; - type Letter = LowerLetter | UpperLetter; - type Numeric = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'; - type Alphanumeric = Letter | Numeric; - - type Mutable = { -readonly [P in keyof T]: T[P] }; - type DeepMutable = T extends Exclude ? T : { -readonly [P in keyof T]: DeepMutable; }; - type FilteredKeys = { [P in keyof T]: T[P] extends U ? P : never }[keyof T]; - - interface ObjectConstructor { - keys(value: Exclude): (string & keyof T)[]; - values(value: Exclude): T[keyof T][]; - entries(value: Exclude): [string & keyof T, T[string & keyof T]][]; - create(value: T): T; - fromEntries(entries: Iterable): Record; - } - - interface Boolean { - toString(): 'true' | 'false'; - } - - interface JSON { - parse(text: string): JToken; - } - - interface ArrayConstructor { - isArray(value: unknown): value is readonly unknown[] | unknown[]; - } - - interface Array { - includes(this: T extends R ? R extends T ? never : this : never, value: R): value is T & R; - } - - interface Set { - has(this: T extends R ? R extends T ? never : this : never, value: R): value is T & R; - } - - type Awaitable = T | PromiseLike; - //type Awaited = T extends PromiseLike ? Awaited : T; - type ExcludeExact = T extends U ? U extends T ? never : T : T; - - namespace NodeJS { - type WorkerProcess = Process & Required>; - - interface Process { - kill(): true; - } - } - - interface String { - toLowerCase(this: T): Lowercase; - toUpperCase(this: T): Uppercase; - } - - function setTimeout(callback: (...args: TArgs) => void, ms: number, ...args: TArgs): NodeJS.Timeout; -} diff --git a/api/src/utils/constants/MimeTypes.ts b/api/src/utils/constants/MimeTypes.ts new file mode 100644 index 0000000..69d5c55 --- /dev/null +++ b/api/src/utils/constants/MimeTypes.ts @@ -0,0 +1,23 @@ +// A lot of these are pretty random and not officially supported (at least I don't use them!!) +export const MIME_TYPES = { + png: 'image/png', + bmp: 'image/bmp', + svg: 'image/svg+xml', + webp: 'image/webp', + apng: 'image/apng', + jpg: 'image/jpeg', + jpeg: 'image/jpeg', + tif: 'image/tiff', + tiff: 'image/tiff', + avif: 'image/avif', + gif: 'image/gif' +} as const; + +export type ImageFormatType = keyof typeof MIME_TYPES; +export type MimeType = typeof MIME_TYPES[ImageFormatType]; + +export function getMimeType(imgFormat: string): MimeType | undefined { + if (imgFormat in MIME_TYPES) + return MIME_TYPES[imgFormat as ImageFormatType]; + return; +} diff --git a/api/src/utils/env/createEnv.ts b/api/src/utils/env/createEnv.ts deleted file mode 100644 index b8d6c95..0000000 --- a/api/src/utils/env/createEnv.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { config } from 'dotenv'; - -import validateEnv from './validateEnv.js'; - -config(); -validateEnv(); - -export default process.env; diff --git a/api/src/utils/env/parseEnv.ts b/api/src/utils/env/parseEnv.ts new file mode 100644 index 0000000..5085333 --- /dev/null +++ b/api/src/utils/env/parseEnv.ts @@ -0,0 +1,20 @@ +import { Static, Type } from '@sinclair/typebox'; +import { Value } from '@sinclair/typebox/value'; +import dotenv from 'dotenv'; + +export const envSchema = Type.Object({ + DOCS_HOST: Type.String(), + PORT: Type.Number(), + DATABASE_URL: Type.String() +}) + +export type Env = Static; + +export default function parseEnv(): Env { + const env = dotenv.config().parsed + try { + return Value.Parse(envSchema, env); + } catch (err: unknown) { + throw Error('Missing/invalid environment variables'); + } +} diff --git a/api/src/utils/env/validateEnv.ts b/api/src/utils/env/validateEnv.ts deleted file mode 100644 index f7767be..0000000 --- a/api/src/utils/env/validateEnv.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { cleanEnv, port, str } from 'envalid'; - -const validateEnv = (): void => { - cleanEnv(process.env, { - PORT: port(), - DATABASE_URL: str() - }); -}; -export default validateEnv; diff --git a/api/src/utils/index.ts b/api/src/utils/isErrnoException.ts similarity index 68% rename from api/src/utils/index.ts rename to api/src/utils/isErrnoException.ts index feac06a..e100e29 100644 --- a/api/src/utils/index.ts +++ b/api/src/utils/isErrnoException.ts @@ -1,5 +1,3 @@ -export * as mapping from '../routes/sharp/v1/mapBody/mapping/index.js'; - export function isErrnoException(e: unknown): e is NodeJS.ErrnoException { if (e instanceof Error) if ('code' in e) return true; diff --git a/api/src/utils/loadConfig.ts b/api/src/utils/loadConfig.ts index 48d5bb4..f673678 100644 --- a/api/src/utils/loadConfig.ts +++ b/api/src/utils/loadConfig.ts @@ -1,29 +1,40 @@ -/* eslint-disable no-console */ import { Value } from '@sinclair/typebox/value'; +import { config } from 'dotenv'; +import fs from 'fs'; import { fileURLToPath } from 'url'; import path from 'path'; +import util from 'util'; import { Config, ConfigSchema } from '../types/Config.js'; const configPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', '..', 'config.json'); -export default async function getConfig(): Promise { - const config = await import(configPath, { with: { type: 'json' } }).then((contents) => { +export async function getConfigAsync(): Promise { + const data = await import(configPath, { with: { type: 'json' } }).then((contents) => { return contents.default ?? {}; }).catch((err) => { + // Is catching and throwing the error not just the same as not catching it? throw err; }); - if (!Value.Check(ConfigSchema, config)) { + return validateConfig(data); +}; + +export function getConfig(): Config { + const data = JSON.parse(fs.readFileSync(configPath, 'utf-8')); + return validateConfig(data); +} + +function validateConfig(data: unknown): Config { + if (!Value.Check(ConfigSchema, data)) { const errors = [...Value.Errors(ConfigSchema, config)] .map((error) => { return addSpaceIfPath(error.path) + error.message; }); - console.log(config); - throw Error('Invalid config file:\n' + errors.join('\n')); + throw Error(`Invalid config file:\n${errors.join('\n')}\n${util.inspect(data)}`); } - return config; -}; + return data; +} const addSpaceIfPath = (path: string): string => path !== '' ? path + ' ' : ''; diff --git a/api/src/utils/typebox/index.ts b/api/src/utils/typebox/index.ts new file mode 100644 index 0000000..0edbb8c --- /dev/null +++ b/api/src/utils/typebox/index.ts @@ -0,0 +1,14 @@ +import { Static, Type } from '@sinclair/typebox'; +import { TypeCompiler } from '@sinclair/typebox/compiler'; + +export const GenericRecord = Type.Record(Type.String(), Type.Unknown()); +export const GenericRecordCheck = TypeCompiler.Compile(GenericRecord).Check; +export type GenericRecordType = Static; + +export const GenericObject = Type.Object({}, { additionalProperties: true }); +export const GenericObjectCheck = TypeCompiler.Compile(GenericObject).Check; +export type GenericObjectType = Static; + +export const GenericArray = Type.Array(Type.Unknown()); +export const GenericArrayCheck = TypeCompiler.Compile(GenericArray); +export type GenericArrayType = Static; diff --git a/api/yarn.lock b/api/yarn.lock index 01f7004..76e11cb 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -251,28 +251,28 @@ dependencies: levn "^0.4.1" -"@fastify/ajv-compiler@^3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@fastify/ajv-compiler/-/ajv-compiler-3.5.0.tgz#459bff00fefbf86c96ec30e62e933d2379e46670" - integrity sha512-ebbEtlI7dxXF5ziNdr05mOY8NnDiPB1XvAlLHctRt/Rc+C3LCOVW5imUVX+mhvUhnNzmPBHewUkOFgGlCxgdAA== +"@fastify/ajv-compiler@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@fastify/ajv-compiler/-/ajv-compiler-4.0.0.tgz#9f5852461473d7f6267f7275b7cb0afc365317cc" + integrity sha512-dt0jyLAlay14LpIn4Fg1SY7V5NJ9KH0YFDpYVQY5cgIVBvdI8908AMx5zQ0bBYPGT6Wh+bM3f2caMmOXLP3QsQ== dependencies: - ajv "^8.11.0" - ajv-formats "^2.1.1" - fast-uri "^2.0.0" + ajv "^8.12.0" + ajv-formats "^3.0.1" + fast-uri "^3.0.0" -"@fastify/error@^3.3.0", "@fastify/error@^3.4.0": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@fastify/error/-/error-3.4.1.tgz#b14bb4cac3dd4ec614becbc643d1511331a6425c" - integrity sha512-wWSvph+29GR783IhmvdwWnN4bUxTD01Vm5Xad4i7i1VuAOItLvbPAb69sb0IQ2N57yprvhNIwAP5B6xfKTmjmQ== +"@fastify/error@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@fastify/error/-/error-4.0.0.tgz#7842d6161fbce78953638318be99033a0c2d5070" + integrity sha512-OO/SA8As24JtT1usTUTKgGH7uLvhfwZPwlptRi2Dp5P4KKmJI3gvsZ8MIHnNwDs4sLf/aai5LzTyl66xr7qMxA== -"@fastify/fast-json-stringify-compiler@^4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.3.0.tgz#5df89fa4d1592cbb8780f78998355feb471646d5" - integrity sha512-aZAXGYo6m22Fk1zZzEUKBvut/CIIQe/BapEORnxiD5Qr0kPHqqI69NtEMCme74h+at72sPhbkb4ZrLd1W3KRLA== +"@fastify/fast-json-stringify-compiler@^5.0.0": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-5.0.1.tgz#659c74f3181fb4f984fe27dcc95d14366ae85ca0" + integrity sha512-f2d3JExJgFE3UbdFcpPwqNUEoHWmt8pAKf8f+9YuLESdefA0WgqxeT6DrGL4Yrf/9ihXNSKOqpjEmurV405meA== dependencies: - fast-json-stringify "^5.7.0" + fast-json-stringify "^6.0.0" -"@fastify/merge-json-schemas@^0.1.0": +"@fastify/merge-json-schemas@^0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz#3551857b8a17a24e8c799e9f51795edb07baa0bc" integrity sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA== @@ -866,10 +866,10 @@ aggregate-error@^4.0.0: clean-stack "^4.0.0" indent-string "^5.0.0" -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== +ajv-formats@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578" + integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ== dependencies: ajv "^8.0.0" @@ -883,7 +883,7 @@ ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.10.0, ajv@^8.11.0: +ajv@^8.0.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -893,6 +893,16 @@ ajv@^8.0.0, ajv@^8.10.0, ajv@^8.11.0: require-from-string "^2.0.2" uri-js "^4.2.2" +ajv@^8.12.0: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" + integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== + dependencies: + fast-deep-equal "^3.1.3" + fast-uri "^3.0.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -925,11 +935,6 @@ anymatch@~3.1.2: resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -archy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw== - are-we-there-yet@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" @@ -968,14 +973,12 @@ atomic-sleep@^1.0.0: resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== -avvio@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/avvio/-/avvio-8.3.0.tgz#1e019433d935730b814978a583eefac41a65082f" - integrity sha512-VBVH0jubFr9LdFASy/vNtm5giTrnbVquWBhT0fyizuNK2rQ7e7ONU2plZQWUNqtE1EmxFEb+kbSkFRkstiaS9Q== +avvio@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/avvio/-/avvio-9.0.0.tgz#3ae02fb318377006e0e06a3f47842c98d8668607" + integrity sha512-UbYrOXgE/I+knFG+3kJr9AgC7uNo8DG+FGGODpH9Bj1O1kL/QDjBXnTem9leD3VdQKtaHjV3O85DQ7hHh4IIHw== dependencies: - "@fastify/error" "^3.3.0" - archy "^1.0.0" - debug "^4.0.0" + "@fastify/error" "^4.0.0" fastq "^1.17.1" balanced-match@^1.0.0: @@ -1339,7 +1342,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.3.4: +debug@4, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1796,11 +1799,6 @@ express@^4.21.0: utils-merge "1.0.1" vary "~1.1.2" -fast-content-type-parse@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fast-content-type-parse/-/fast-content-type-parse-1.1.0.tgz#4087162bf5af3294d4726ff29b334f72e3a1092c" - integrity sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ== - fast-decode-uri-component@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" @@ -1827,16 +1825,16 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-json-stringify@^5.7.0, fast-json-stringify@^5.8.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-5.12.0.tgz#e9f77dc0b4face74351320c3618f1d869de5cb18" - integrity sha512-7Nnm9UPa7SfHRbHVA1kJQrGXCRzB7LMlAAqHXQFkEQqueJm1V8owm0FsE/2Do55/4CcdhwiLQERaKomOnKQkyA== +fast-json-stringify@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-6.0.0.tgz#15c5e85b567ead695773bf55938b56aaaa57d805" + integrity sha512-FGMKZwniMTgZh7zQp9b6XnBVxUmKVahQLQeRQHqwYmPDqDhcEKZ3BaQsxelFFI5PY7nN71OEeiL47/zUWcYe1A== dependencies: - "@fastify/merge-json-schemas" "^0.1.0" - ajv "^8.10.0" - ajv-formats "^2.1.1" + "@fastify/merge-json-schemas" "^0.1.1" + ajv "^8.12.0" + ajv-formats "^3.0.1" fast-deep-equal "^3.1.3" - fast-uri "^2.1.0" + fast-uri "^2.3.0" json-schema-ref-resolver "^1.0.1" rfdc "^1.2.0" @@ -1857,32 +1855,36 @@ fast-redact@^3.1.1: resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.3.0.tgz#7c83ce3a7be4898241a46560d51de10f653f7634" integrity sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ== -fast-uri@^2.0.0, fast-uri@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.3.0.tgz#bdae493942483d299e7285dcb4627767d42e2793" - integrity sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw== +fast-uri@^2.3.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.4.0.tgz#67eae6fbbe9f25339d5d3f4c4234787b65d7d55e" + integrity sha512-ypuAmmMKInk5q7XcepxlnUWDLWv4GFtaJqAzWKqn62IpQ3pejtr5dTVbt3vwqVaMKmkNR55sTT+CqUKIaT21BA== -fastify@^4.23.2: - version "4.26.1" - resolved "https://registry.yarnpkg.com/fastify/-/fastify-4.26.1.tgz#91b11565d2533b7e83d267ad8998c39d263e0279" - integrity sha512-tznA/G55dsxzM5XChBfcvVSloG2ejeeotfPPJSFaWmHyCDVGMpvf3nRNbsCb/JTBF9RmQFBfuujWt3Nphjesng== +fast-uri@^3.0.0, fast-uri@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" + integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== + +fastify@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fastify/-/fastify-5.0.0.tgz#f8f80bd741bde2de1997c25dbe31e61c91978111" + integrity sha512-Qe4dU+zGOzg7vXjw4EvcuyIbNnMwTmcuOhlOrOJsgwzvjEZmsM/IeHulgJk+r46STjdJS/ZJbxO8N70ODXDMEQ== dependencies: - "@fastify/ajv-compiler" "^3.5.0" - "@fastify/error" "^3.4.0" - "@fastify/fast-json-stringify-compiler" "^4.3.0" + "@fastify/ajv-compiler" "^4.0.0" + "@fastify/error" "^4.0.0" + "@fastify/fast-json-stringify-compiler" "^5.0.0" abstract-logging "^2.0.1" - avvio "^8.3.0" - fast-content-type-parse "^1.1.0" - fast-json-stringify "^5.8.0" - find-my-way "^8.0.0" - light-my-request "^5.11.0" - pino "^8.17.0" - process-warning "^3.0.0" + avvio "^9.0.0" + fast-json-stringify "^6.0.0" + find-my-way "^9.0.0" + light-my-request "^6.0.0" + pino "^9.0.0" + process-warning "^4.0.0" proxy-addr "^2.0.7" - rfdc "^1.3.0" + rfdc "^1.3.1" secure-json-parse "^2.7.0" - semver "^7.5.4" - toad-cache "^3.3.0" + semver "^7.6.0" + toad-cache "^3.7.0" fastq@^1.15.0, fastq@^1.17.1, fastq@^1.6.0: version "1.17.1" @@ -1947,14 +1949,14 @@ finalhandler@1.3.1: statuses "2.0.1" unpipe "~1.0.0" -find-my-way@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-8.1.0.tgz#cc05e8e4b145322299d0de0a839b5be528c2083e" - integrity sha512-41QwjCGcVTODUmLLqTMeoHeiozbMXYMAE1CKFiDyi9zVZ2Vjh0yz3MF0WQZoIb+cmzP/XlbFjlF2NtJmvZHznA== +find-my-way@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-9.0.1.tgz#991c3a7af36734480d48cd4ad0889ed168ed6c40" + integrity sha512-/5NN/R0pFWuff16TMajeKt2JyiW+/OE8nOO8vo1DwZTxLaIURb7lcBYPIgRPh61yCNh9l8voeKwcrkUzmB00vw== dependencies: fast-deep-equal "^3.1.3" fast-querystring "^1.0.0" - safe-regex2 "^2.0.0" + safe-regex2 "^4.0.0" find-up@^5.0.0: version "5.0.0" @@ -2498,14 +2500,14 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -light-my-request@^5.11.0: - version "5.11.1" - resolved "https://registry.yarnpkg.com/light-my-request/-/light-my-request-5.11.1.tgz#9bbb993039ff5ccdcdcff359c39892a3fac9bdcd" - integrity sha512-KXAh2m6VRlkWCk2KfmHE7tLBXKh30JE0tXUJY4dNxje4oLmPKUqlUfImiEQZLphx+Z9KTQcVv4DjGnJxkVOIbA== +light-my-request@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/light-my-request/-/light-my-request-6.0.0.tgz#97c6d0d5448ea2fc37836f0aefe94298f5a87dde" + integrity sha512-kFkFXrmKCL0EEeOmJybMH5amWFd+AFvlvMlvFTRxCUwbhfapZqDmeLMPoWihntnYY6JpoQDE9k+vOzObF1fDqg== dependencies: cookie "^0.6.0" - process-warning "^2.0.0" - set-cookie-parser "^2.4.1" + process-warning "^4.0.0" + set-cookie-parser "^2.6.0" lines-and-columns@^1.1.6: version "1.2.4" @@ -3121,35 +3123,35 @@ picomatch@^4.0.2: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== -pino-abstract-transport@v1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8" - integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA== +pino-abstract-transport@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz#97f9f2631931e242da531b5c66d3079c12c9d1b5" + integrity sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q== dependencies: readable-stream "^4.0.0" split2 "^4.0.0" -pino-std-serializers@^6.0.0: - version "6.2.2" - resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3" - integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA== +pino-std-serializers@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz#7c625038b13718dbbd84ab446bd673dc52259e3b" + integrity sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA== -pino@^8.17.0: - version "8.19.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-8.19.0.tgz#ccc15ef736f103ec02cfbead0912bc436dc92ce4" - integrity sha512-oswmokxkav9bADfJ2ifrvfHUwad6MLp73Uat0IkQWY3iAw5xTRoznXbXksZs8oaOUMpmhVWD+PZogNzllWpJaA== +pino@^9.0.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-9.4.0.tgz#e4600ff199efc744856a5b3b71c53e38998eae5a" + integrity sha512-nbkQb5+9YPhQRz/BeQmrWpEknAaqjpAqRK8NwJpmrX/JHu7JuZC5G1CeAwJDJfGes4h+YihC6in3Q2nGb+Y09w== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1" on-exit-leak-free "^2.1.0" - pino-abstract-transport v1.1.0 - pino-std-serializers "^6.0.0" - process-warning "^3.0.0" + pino-abstract-transport "^1.2.0" + pino-std-serializers "^7.0.0" + process-warning "^4.0.0" quick-format-unescaped "^4.0.3" real-require "^0.2.0" safe-stable-stringify "^2.3.1" - sonic-boom "^3.7.0" - thread-stream "^2.0.0" + sonic-boom "^4.0.1" + thread-stream "^3.0.0" pkg-types@^1.1.1: version "1.2.0" @@ -3221,15 +3223,10 @@ prisma@^5.10.2: dependencies: "@prisma/engines" "5.10.2" -process-warning@^2.0.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-2.3.2.tgz#70d8a3251aab0eafe3a595d8ae2c5d2277f096a5" - integrity sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA== - -process-warning@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-3.0.0.tgz#96e5b88884187a1dce6f5c3166d611132058710b" - integrity sha512-mqn0kFRl0EoqhnL0GQ0veqFHyIN1yig9RHh/InzORTUiZHFRAur+aMtRkELNwGs9aNwKS6tg/An4NYBPGwvtzQ== +process-warning@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-4.0.0.tgz#581e3a7a1fb456c5f4fd239f76bce75897682d5a" + integrity sha512-/MyYDxttz7DfGMMHiysAsFE4qF+pQYAA8ziO/3NcRVrQ5fSk+Mns4QZA/oRPFzvcqNoVJXQNWNAsdwBXLUkQKw== process@^0.11.10: version "0.11.10" @@ -3386,21 +3383,26 @@ resolve@^1.22.4: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -ret@~0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.2.2.tgz#b6861782a1f4762dce43402a71eb7a283f44573c" - integrity sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ== +ret@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.5.0.tgz#30a4d38a7e704bd96dc5ffcbe7ce2a9274c41c95" + integrity sha512-I1XxrZSQ+oErkRR4jYbAyEEu2I0avBvvMM5JN+6EBprOGRCs63ENqZ3vjavq8fBw2+62G5LF5XelKwuJpcvcxw== reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rfdc@^1.2.0, rfdc@^1.3.0: +rfdc@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== +rfdc@^1.3.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca" + integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA== + rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -3425,12 +3427,12 @@ safe-buffer@5.2.1, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex2@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/safe-regex2/-/safe-regex2-2.0.0.tgz#b287524c397c7a2994470367e0185e1916b1f5b9" - integrity sha512-PaUSFsUaNNuKwkBijoAPHAK6/eM6VirvyPWlZ7BAQy4D+hCvh4B6lIG+nPdhbFfIbP+gTGBcrdsOaUs0F+ZBOQ== +safe-regex2@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/safe-regex2/-/safe-regex2-4.0.0.tgz#5e04d8362cd4884753c8bce9715d4759a5239c0a" + integrity sha512-Hvjfv25jPDVr3U+4LDzBuZPPOymELG3PYcSk5hcevooo1yxxamQL/bHs/GrEPGmMoMEwRrHVGiCA1pXi97B8Ew== dependencies: - ret "~0.2.0" + ret "~0.5.0" safe-stable-stringify@^2.3.1: version "2.5.0" @@ -3464,13 +3466,6 @@ semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -semver@^7.5.4: - version "7.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" - integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== - dependencies: - lru-cache "^6.0.0" - semver@^7.6.0, semver@^7.6.3: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" @@ -3510,10 +3505,10 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-cookie-parser@^2.4.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51" - integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ== +set-cookie-parser@^2.6.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.0.tgz#ef5552b56dc01baae102acb5fc9fb8cd060c30f9" + integrity sha512-lXLOiqpkUumhRdFF3k1osNXCy9akgx/dyPZ5p8qAg9seJzXr5ZrlqZuWIMuY6ejOsVLE6flJ5/h3lsn57fQ/PQ== set-function-length@^1.2.1: version "1.2.1" @@ -3614,10 +3609,10 @@ slash@^4.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== -sonic-boom@^3.7.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.8.0.tgz#e442c5c23165df897d77c3c14ef3ca40dec66a66" - integrity sha512-ybz6OYOUjoQQCQ/i4LU8kaToD8ACtYP+Cj5qd2AO36bwbdewxWJ3ArmJ2cr6AvxlL2o0PqnCcPGUgkILbfkaCA== +sonic-boom@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-4.1.0.tgz#4f039663ba191fac5cfe4f1dc330faac079e4342" + integrity sha512-NGipjjRicyJJ03rPiZCJYjwlsuP2d1/5QUviozRXC7S3WdVWNK5e3Ojieb9CCyfhq2UC+3+SRd9nG3I2lPRvUw== dependencies: atomic-sleep "^1.0.0" @@ -3751,10 +3746,10 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -thread-stream@^2.0.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.4.1.tgz#6d588b14f0546e59d3f306614f044bc01ce43351" - integrity sha512-d/Ex2iWd1whipbT681JmTINKw0ZwOUBZm7+Gjs64DHuX34mmw8vJL2bFAaNacaW72zYiTJxSHi5abUuOi5nsfg== +thread-stream@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-3.1.0.tgz#4b2ef252a7c215064507d4ef70c05a5e2d34c4f1" + integrity sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A== dependencies: real-require "^0.2.0" @@ -3770,7 +3765,7 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -toad-cache@^3.3.0: +toad-cache@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/toad-cache/-/toad-cache-3.7.0.tgz#b9b63304ea7c45ec34d91f1d2fa513517025c441" integrity sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw== diff --git a/docker-compose.yml b/docker-compose.yml index 3f93fdf..1f1b2be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,6 +17,7 @@ services: # - POSTGRES_DB - DATABASE_URL - PORT=${API_PORT} + - DOCS_HOST - NODE_ENV volumes: - ./api/assets:/usr/src/app/assets From e2de704a6199cc8d041f546f27ff0c6e57bbc3d4 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Tue, 24 Sep 2024 13:32:03 +0200 Subject: [PATCH 14/24] Added unknownCatch rule --- api/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/api/tsconfig.json b/api/tsconfig.json index 446ebbd..71b7dec 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -13,6 +13,7 @@ "strictBindCallApply": true, "strictPropertyInitialization": true, "forceConsistentCasingInFileNames": true, + "useUnknownInCatchVariables": true, "alwaysStrict": true, "noUnusedLocals": true, "noUnusedParameters": true, From 7f4f2bfc0d66a6b110070c827bf776d11e5dc2bb Mon Sep 17 00:00:00 2001 From: RagingLink Date: Tue, 24 Sep 2024 13:32:54 +0200 Subject: [PATCH 15/24] Fix bug related to different this context --- api/src/utils/typebox/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/utils/typebox/index.ts b/api/src/utils/typebox/index.ts index 0edbb8c..e99952a 100644 --- a/api/src/utils/typebox/index.ts +++ b/api/src/utils/typebox/index.ts @@ -2,13 +2,13 @@ import { Static, Type } from '@sinclair/typebox'; import { TypeCompiler } from '@sinclair/typebox/compiler'; export const GenericRecord = Type.Record(Type.String(), Type.Unknown()); -export const GenericRecordCheck = TypeCompiler.Compile(GenericRecord).Check; export type GenericRecordType = Static; +export const GenericRecordTypeCheck = TypeCompiler.Compile(GenericRecord); export const GenericObject = Type.Object({}, { additionalProperties: true }); -export const GenericObjectCheck = TypeCompiler.Compile(GenericObject).Check; export type GenericObjectType = Static; +export const GenericObjectTypeCheck = TypeCompiler.Compile(GenericObject); export const GenericArray = Type.Array(Type.Unknown()); -export const GenericArrayCheck = TypeCompiler.Compile(GenericArray); export type GenericArrayType = Static; +export const GenericArrayTypeCheck = TypeCompiler.Compile(GenericArray); From b89922a60ea40334e21cdcbe60a1ec6c8b5aea9d Mon Sep 17 00:00:00 2001 From: RagingLink Date: Tue, 24 Sep 2024 13:33:37 +0200 Subject: [PATCH 16/24] Added more error catching * Removed unused guard utils --- api/src/routes/sharp/v1/SharpRoute.ts | 26 +- api/src/routes/sharp/v1/managers/Image.ts | 6 + .../routes/sharp/v1/managers/ImageFetcher.ts | 11 +- .../routes/sharp/v1/managers/ImageManager.ts | 253 ++++++++++-------- .../routes/sharp/v1/mapBody/bodyMappings.ts | 19 +- api/src/routes/sharp/v1/mapBody/index.ts | 15 +- .../routes/sharp/v2/services/ImageFetcher.ts | 10 +- api/src/utils/guard/hasProperty.ts | 3 - api/src/utils/guard/hasValue.ts | 3 - api/src/utils/guard/index.ts | 7 - 10 files changed, 190 insertions(+), 163 deletions(-) delete mode 100644 api/src/utils/guard/hasProperty.ts delete mode 100644 api/src/utils/guard/hasValue.ts delete mode 100644 api/src/utils/guard/index.ts diff --git a/api/src/routes/sharp/v1/SharpRoute.ts b/api/src/routes/sharp/v1/SharpRoute.ts index f18d7e3..702bd79 100644 --- a/api/src/routes/sharp/v1/SharpRoute.ts +++ b/api/src/routes/sharp/v1/SharpRoute.ts @@ -161,20 +161,16 @@ export default class SharpRoute { } // Send image - private processImage(req: FastifyRequest<{ Body: GenericRecordType }>, reply: FastifyReply): void { - void this.imageEditor.generateImage(req.body).then((output) => { - void output.image.format().then((format) => { - reply.type(format); - if (output.image.edited) { - const stream = new PassThrough(); - output.image.sharp.pipe(stream); - reply.send(stream); - } else { - reply.send(output.image.buffer); - } - }); - - }); + private async processImage(req: FastifyRequest<{ Body: GenericRecordType }>, reply: FastifyReply): Promise { + const output = await this.imageEditor.generateImage(req.body); + const mimeType = await output.image.getMimeType(); + reply.type(mimeType); + // not sure if this even makes a performance difference + if (output.image.edited) { + const stream = new PassThrough(); + output.image.sharp.pipe(stream); + return reply.send(stream); + } + return reply.send(output.image.buffer); } - } diff --git a/api/src/routes/sharp/v1/managers/Image.ts b/api/src/routes/sharp/v1/managers/Image.ts index a9a86ff..8c7faca 100644 --- a/api/src/routes/sharp/v1/managers/Image.ts +++ b/api/src/routes/sharp/v1/managers/Image.ts @@ -4,6 +4,7 @@ import sharp, { Sharp } from 'sharp'; import { CropOption, InputBody, ReplaceColorBody } from '../../../../types/PayloadTypes.js'; import replaceColor from '../../replaceColor.js'; +import { getMimeType, MimeType } from '../../../../utils/constants/MimeTypes.js'; export default class Image { #sharpImage?: Sharp; @@ -23,6 +24,11 @@ export default class Image { return (this.edited ? (await this.sharp.metadata()).format : (await fileTypeFromBuffer(this.buffer))?.ext) ?? 'png'; } + public async getMimeType(): Promise { + const format = await this.format(); + return getMimeType(format) ?? 'image/png'; + } + //* Getters and setters public get sharp(): Sharp { this.edited = true; diff --git a/api/src/routes/sharp/v1/managers/ImageFetcher.ts b/api/src/routes/sharp/v1/managers/ImageFetcher.ts index f62a0fb..ae40b18 100644 --- a/api/src/routes/sharp/v1/managers/ImageFetcher.ts +++ b/api/src/routes/sharp/v1/managers/ImageFetcher.ts @@ -34,7 +34,7 @@ export class ImageFetcher { this.cache.refreshTimestamp(src); return cachedImage.buffer; } - const buffer = await this.load(src); + const buffer = await this.load(src) ?? this.defaultImageBuffer; this.store(src, buffer); return buffer; } @@ -43,9 +43,14 @@ export class ImageFetcher { this.cache.set(src, { buffer }); } - public async load(src: string): Promise { + public async load(src: string): Promise { try { - const arrayBuffer = await (await fetch(src)).arrayBuffer(); + const response = await fetch(src); + if (response.status === 404) { + this.logger.log.error(src, 'not found'); + return; + } + const arrayBuffer = await response.arrayBuffer(); return Buffer.from(arrayBuffer); } catch (_: unknown) { throw Error('Invalid image'); diff --git a/api/src/routes/sharp/v1/managers/ImageManager.ts b/api/src/routes/sharp/v1/managers/ImageManager.ts index 5a2d555..89539fd 100644 --- a/api/src/routes/sharp/v1/managers/ImageManager.ts +++ b/api/src/routes/sharp/v1/managers/ImageManager.ts @@ -10,7 +10,6 @@ import Image from './Image.js'; import { ImageEditor } from './ImageEditor.js'; import CacheManager from '../../../../utils/CacheManager.js'; -import { guard } from '../../../../utils/guard/index.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Prisma from '../../Prisma.js'; import { GenericObjectType } from '../../../../utils/typebox/index.js'; @@ -40,52 +39,66 @@ export class ImageManager { return fileName; } - public async saveImage(image: Image, body?: BodyType, persist = false): Promise { - let fileType: string; - if (image.edited) { - fileType = (await image.sharp.metadata()).format ?? 'png'; - } else { - fileType = (await fileTypeFromBuffer(image.buffer))?.ext ?? 'png'; - } - const fileName = uuidv4() + '.' + fileType; - if (image.edited) { - this.awaitingSharpBuffer[fileName] = image.sharp.toBuffer().then((buffer) => { - this.cache.set(fileName, { buffer }); + public async saveImage(image: Image, body?: BodyType, persist = false): Promise { + try { + let fileType: string; + if (image.edited) { + fileType = (await image.sharp.metadata()).format ?? 'png'; + } else { + fileType = (await fileTypeFromBuffer(image.buffer))?.ext ?? 'png'; + } + const fileName = uuidv4() + '.' + fileType; + if (image.edited) { + this.awaitingSharpBuffer[fileName] = image.sharp.toBuffer().then((buffer) => { + this.cache.set(fileName, { buffer }); - delete this.awaitingSharpBuffer[fileName]; - this.writeFile(buffer, fileName); - }); - } else { - this.cache.set(fileName, { buffer: image.buffer }); - this.writeFile(image.buffer, fileName); + delete this.awaitingSharpBuffer[fileName]; + void this.writeFile(buffer, fileName); + }); + } else { + this.cache.set(fileName, { buffer: image.buffer }); + void this.writeFile(image.buffer, fileName); + } + if (body !== undefined) + this.saveImageToDB(fileName, body, persist).catch((err) => { + this.logger.log.error('ImageManager', err); + }); + return fileName; + } catch (err: unknown) { + this.logger.log.error('Error saving image:', err); + return; } - if (body !== undefined) - this.saveImageToDB(fileName, body, persist).catch((err) => { - this.logger.log.error('ImageManager', err); - }); - return fileName; } public async saveImageToDB(fileName: string, body?: BodyType, persist = false): Promise { - const cache_duration = body?.cacheDuration ?? 7; - await this.prisma.image.create({ - data: { - id: fileName, - body: JSON.stringify(body), - created_at: new Date(), - last_accessed: new Date(), - cache_duration: cache_duration <= 30 ? cache_duration : 30, - persisted: persist - } - }); + try { + const cache_duration = body?.cacheDuration ?? 7; + await this.prisma.image.create({ + data: { + id: fileName, + body: JSON.stringify(body), + created_at: new Date(), + last_accessed: new Date(), + cache_duration: cache_duration <= 30 ? cache_duration : 30, + persisted: persist + } + }); + } catch (err: unknown) { + this.logger.log.error('Error saving image:', err); + } } - public async saveBuffer(buffer: Buffer): Promise { - const fileType = await fileTypeFromBuffer(buffer); - const fileName = uuidv4() + '.' + (fileType?.ext ?? 'png'); - this.cache.set(fileName, { buffer }); - this.writeFile(buffer, fileName); - return fileName; + public async saveBuffer(buffer: Buffer): Promise { + try { + const fileType = await fileTypeFromBuffer(buffer); + const fileName = uuidv4() + '.' + (fileType?.ext ?? 'png'); + this.cache.set(fileName, { buffer }); + void this.writeFile(buffer, fileName); + return fileName; + } catch (err: unknown) { + this.logger.log.error('Error saving image', err); + return; + } } public hasFile(fileName: string): boolean { @@ -96,33 +109,38 @@ export class ImageManager { return fs.existsSync(path.join(this.#legacyImagesPath, fileName)); } - public writeFile(buffer: Buffer, fileName: string): void { - fs.writeFile(path.join(this.#storedImagesPath, fileName), buffer, (err) => { - if (err !== null) - return this.logger.log.error('ImageManager', err); - }); + public async writeFile(buffer: Buffer, fileName: string): Promise { + try { + await fs.promises.writeFile(path.join(this.#storedImagesPath, fileName), buffer); + } catch (err) { + this.logger.log.error('Error writing file:', err); + } } - public deleteFile(fileName: string): void { - fs.rmSync(path.join(this.#storedImagesPath, fileName)); + public async deleteFile(fileName: string): Promise { + try { + await fs.promises.rm(path.join(this.#storedImagesPath, fileName)); + } catch (err) { + this.logger.log.error('Error deleting file:', err); + } } public async getImage(fileName: string): Promise { - if (guard.hasProperty(this.awaitingSharpBuffer, fileName)) - await this.awaitingSharpBuffer[fileName]; - const cachedObj = this.cache.get(fileName); - if (cachedObj !== undefined) { - this.updateLastAccessed(fileName); - return cachedObj.buffer; - } else if (this.hasFile(fileName)) { - this.updateLastAccessed(fileName); - this.cache.set(fileName, { buffer: fs.readFileSync(path.join(this.#storedImagesPath, fileName)) }); - - return this.cache.get(fileName)?.buffer; - } else if (this.hasLegacyFile(fileName)) { - return fs.readFileSync(path.join(this.#legacyImagesPath, fileName)); - } try { + if (fileName in this.awaitingSharpBuffer) + await this.awaitingSharpBuffer[fileName]; + const cachedObj = this.cache.get(fileName); + if (cachedObj !== undefined) { + void this.updateLastAccessed(fileName); + return cachedObj.buffer; + } else if (this.hasFile(fileName)) { + void this.updateLastAccessed(fileName); + this.cache.set(fileName, { buffer: fs.readFileSync(path.join(this.#storedImagesPath, fileName)) }); + + return this.cache.get(fileName)?.buffer; + } else if (this.hasLegacyFile(fileName)) { + return fs.readFileSync(path.join(this.#legacyImagesPath, fileName)); + } const image = await this.prisma.image.findUnique({ where: { id: fileName @@ -133,8 +151,8 @@ export class ImageManager { const output = await this.editor.generateImage(body); const buffer = output.image.edited ? await output.image.sharp.toBuffer() : output.image.buffer; this.cache.set(fileName, { buffer }); - this.writeFile(buffer, fileName); - this.updateLastAccessed(fileName); + void this.writeFile(buffer, fileName); + void this.updateLastAccessed(fileName); return buffer; } } catch (e: unknown) { @@ -143,30 +161,32 @@ export class ImageManager { } - public updateLastAccessed(fileName: string): void { - this.prisma.image.findUnique({ - where: { - id: fileName - } - }).then((image) => { - if (image === null) + public async updateLastAccessed(fileName: string): Promise { + try { + const image = await this.prisma.image.findUnique({ + where: { + id: fileName + } + }); + if (image === null) { this.saveImageToDB(fileName).then(() => { this.logger.log.prisma('Saved (legacy) image to DB'); }).catch((err) => { - this.logger.log.prisma(err); + this.logger.log.error(err); }); - else - void this.prisma.image.update({ + } else { + await this.prisma.image.update({ where: { id: fileName }, data: { last_accessed: new Date() } }); - }).catch(() => { - this.logger.log.error('Prisma', `Failed to update last accessed for "${fileName}"`); - }); - this.cache.refreshTimestamp(fileName); + } + this.cache.refreshTimestamp(fileName); + } catch (err) { + this.logger.log.error(err); + } } private startImageSweep(): void { @@ -176,53 +196,60 @@ export class ImageManager { } private async sweepImages(): Promise { - const deletedCount = { - fs: await this.sweepFsImages(), - pg: await this.sweepPgImages() - }; - const result: string[] = []; - if (deletedCount.fs > 0) - result.push(`Deleted ${deletedCount.fs} images from FS`); - if (deletedCount.pg > 0) - result.push(`Deleted ${deletedCount.pg} images from PG`); - if (result.length > 0) - this.logger.log.prisma(result.join('\n')); - - this.prisma.image.count().then(async (prismaCount) => { + try { + const deletedCount = { + fs: await this.sweepFsImages(), + pg: await this.sweepPgImages() + }; + const result: string[] = []; + if (deletedCount.fs > 0) + result.push(`Deleted ${deletedCount.fs} images from FS`); + if (deletedCount.pg > 0) + result.push(`Deleted ${deletedCount.pg} images from PG`); + if (result.length > 0) + this.logger.log.prisma(result.join('\n')); + + const prismaCount = await this.prisma.image.count(); const files = await fs.promises.readdir(this.#storedImagesPath).catch((err) => { this.logger.log.error(this.#storedImagesPath, err); return []; }); this.logger.log.prisma(`Currently storing ${files.length} images on disk and ${prismaCount} in Prisma`); - - }).catch((err) => this.logger.log.error('ImageManager', err)); + } catch (err) { + this.logger.log.error('Error sweeping images', err); + } } private async sweepFsImages(): Promise { - let deletedN = 0; - const expiredImages = (await this.prisma.image.findMany({ - where: { - last_accessed: { - lte: new Date(Date.now() - 24 * 3600 * 1000) - }, - persisted: { - not: true + try { + let deletedN = 0; + const expiredImages = (await this.prisma.image.findMany({ + where: { + last_accessed: { + lte: new Date(Date.now() - 24 * 3600 * 1000) + }, + persisted: { + not: true + } + } + })).filter((image) => { + return Date.now() > image.last_accessed.getMilliseconds() + image.cache_duration * 24 * 3600 * 1000; + }); + for (const image of expiredImages) { + try { + if (!this.hasFile(image.id)) + continue; + void this.deleteFile(image.id); + deletedN++; + } catch (e: unknown) { + this.logger.log.error('ImageManager', e); } } - })).filter((image) => { - return Date.now() > image.last_accessed.getMilliseconds() + image.cache_duration * 24 * 3600 * 1000; - }); - for (const image of expiredImages) { - try { - if (!this.hasFile(image.id)) - continue; - this.deleteFile(image.id); - deletedN++; - } catch (e: unknown) { - this.logger.log.error('ImageManager', e); - } + return deletedN; + } catch (err) { + this.logger.log.error('Error sweeping FS images:', err); + return 0; } - return deletedN; } private async sweepPgImages(): Promise { diff --git a/api/src/routes/sharp/v1/mapBody/bodyMappings.ts b/api/src/routes/sharp/v1/mapBody/bodyMappings.ts index ff8acbf..065aa8c 100644 --- a/api/src/routes/sharp/v1/mapBody/bodyMappings.ts +++ b/api/src/routes/sharp/v1/mapBody/bodyMappings.ts @@ -59,12 +59,14 @@ export const bodyWithoutChild = Type.Partial(Type.Object({ replace: Type.String(), delta: Type.Optional(Type.Number()) }), - crop: Type.Partial(Type.Object({ - width: Type.Number(), - height: Type.Number(), - x: Type.Number(), - y: Type.Number() - })), + crop: Type.Union([ + Type.Literal('auto'), + Type.Partial(Type.Object({ + width: Type.Number(), + height: Type.Number(), + x: Type.Number(), + y: Type.Number() + }))]), resize: Type.Partial(Type.Object({ width: Type.Number(), height: Type.Number() @@ -89,10 +91,7 @@ export const BodySchema = Type.Partial(Type.Object({ export type BodyType = Static; -const BodyTypeCheck = TypeCompiler.Compile(BodySchema); - -export const BodyCheck = BodyTypeCheck.Check; -export const BodyErrors = BodyTypeCheck.Errors; +export const BodyTypeCheck = TypeCompiler.Compile(BodySchema); export type TextType = Static; export type ChildType = Static; diff --git a/api/src/routes/sharp/v1/mapBody/index.ts b/api/src/routes/sharp/v1/mapBody/index.ts index a68acca..52b8748 100644 --- a/api/src/routes/sharp/v1/mapBody/index.ts +++ b/api/src/routes/sharp/v1/mapBody/index.ts @@ -1,7 +1,9 @@ -import { BodyCheck, BodyErrors, BodyType } from './bodyMappings.js'; +/* eslint-disable no-console */ + +import { BodyType, BodyTypeCheck } from './bodyMappings.js'; import { MetaBody } from '../../../../types/ImageTypes.js'; -import { GenericArrayType, GenericObjectType, GenericRecordCheck, GenericRecordType } from '../../../../utils/typebox/index.js'; +import { GenericArrayType, GenericObjectType, GenericRecordType, GenericRecordTypeCheck } from '../../../../utils/typebox/index.js'; const propertyAliases = { bg: 'background', @@ -17,9 +19,10 @@ const propertyAliases = { export default function mapBody(inputBody: GenericObjectType, meta: MetaBody): BodyType { convertAliases(inputBody); - if (BodyCheck(inputBody)) + console.log(inputBody); + if (BodyTypeCheck.Check(inputBody)) return inputBody; - const errors = [...BodyErrors(inputBody)].map((err) => { + const errors = [...BodyTypeCheck.Errors(inputBody)].map((err) => { return err.message; }); meta.errors.push(...errors); @@ -34,14 +37,14 @@ export default function mapBody(inputBody: GenericObjectType, meta: MetaBody): B function convertAliases(inputBody: GenericRecordType | GenericArrayType): void { if (Array.isArray(inputBody)) { for (const element of inputBody) { - if (GenericRecordCheck(element)) + if (GenericRecordTypeCheck.Check(element)) convertAliases(element); } return; } const keys = Object.keys(inputBody); for (const key of keys) { - if (GenericRecordCheck(inputBody[key])) + if (GenericRecordTypeCheck.Check(inputBody[key])) convertAliases(inputBody[key]); if (!(key in propertyAliases)) continue; diff --git a/api/src/routes/sharp/v2/services/ImageFetcher.ts b/api/src/routes/sharp/v2/services/ImageFetcher.ts index 5fe0e96..69c942d 100644 --- a/api/src/routes/sharp/v2/services/ImageFetcher.ts +++ b/api/src/routes/sharp/v2/services/ImageFetcher.ts @@ -28,10 +28,14 @@ export default class ImageFetcher { return cachedImage.buffer; try { - const arrayBuffer = await (await fetch(src)).arrayBuffer(); - const buffer = Buffer.from(arrayBuffer); + const response = await fetch(src); + // Caching invalid images may not be the best response in case the image gets 'fixed', but whatever + if (response.status === 404) { + this.logger.log.error('404 Image not found'); + return this.cache.set(src, { buffer: this.defaultImageBuffer }).buffer; + } this.logger.log.time('Fetched image', timer.stop().elapsedBlueStr); - return this.cache.set(src, { buffer }).buffer; + return this.cache.set(src, { buffer: Buffer.from(await response.arrayBuffer()) }).buffer; } catch (e: unknown) { //throw Error('Invalid image'); this.logger.log.error(e); diff --git a/api/src/utils/guard/hasProperty.ts b/api/src/utils/guard/hasProperty.ts deleted file mode 100644 index 2dac9a7..0000000 --- a/api/src/utils/guard/hasProperty.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function hasProperty(value: T, name: PropertyKey): name is keyof T { - return Object.prototype.hasOwnProperty.call(value, name); -} diff --git a/api/src/utils/guard/hasValue.ts b/api/src/utils/guard/hasValue.ts deleted file mode 100644 index ef43e5c..0000000 --- a/api/src/utils/guard/hasValue.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function hasValue(value: T): value is Exclude { - return value !== undefined && value !== null; -} diff --git a/api/src/utils/guard/index.ts b/api/src/utils/guard/index.ts deleted file mode 100644 index 093ce59..0000000 --- a/api/src/utils/guard/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import * as hasProperty from './hasProperty.js'; -import * as hasValue from './hasValue.js'; - -export const guard = { - ...hasProperty, - ...hasValue -}; From 0859834ad192d14fec3bca1649b2cc40935b32c0 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Tue, 24 Sep 2024 13:38:58 +0200 Subject: [PATCH 17/24] Added ENV variables to example --- .env.example | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.env.example b/.env.example index e69de29..f535898 100644 --- a/.env.example +++ b/.env.example @@ -0,0 +1,18 @@ +POSTGRES_USER= +POSTGRES_DB= +POSTGRES_PASSWORD= +POSTGRES_HOST= +POSTGRES_PORT= +# This is the database url when using docker. +# For development ./api/.env is used with a different database url +# not sure if I can improve that. +DATABASE_URL= + +NODE_ENV= +API_PORT= +#DISCORD_TOKEN= +#DISCORD_LOGGING= + +# Docs +DOCS_PORT= +DOCS_HOST= From 4721acb1070869445d4b87e778701edcdc72e65a Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 25 Sep 2024 11:51:29 +0200 Subject: [PATCH 18/24] Delete unused packages --- api/package.json | 22 +- api/yarn.lock | 829 +---------------------------------------------- 2 files changed, 10 insertions(+), 841 deletions(-) diff --git a/api/package.json b/api/package.json index 4f5ee94..f16dc7f 100644 --- a/api/package.json +++ b/api/package.json @@ -12,6 +12,7 @@ "dbpush": "npx prisma db push", "setupPrisma": "yarn run migrate && yarn run dbpush", "clean": "del-cli \"./out\"", + "clean:full": "del-cli \"**/*.js\" \"**/*.js.map\" \"!node_modules\"", "build": "tsc", "watch": "tsc --watch", "rebuild": "yarn run clean && yarn run build", @@ -24,27 +25,16 @@ "@sinclair/typebox": "^0.33.12", "buffer-image-size": "^0.6.4", "canvas": "2.11.2", - "cat-loggr": "^1.2.2", "chalk": "^5.1.2", "color": "^4.2.3", - "config": "^3.3.12", - "dayjs": "^1.11.6", - "delta-e": "^0.0.8", "dotenv": "^16.0.3", - "emoji-regex": "^10.2.1", - "envalid": "^7.3.1", "eris": "^0.17.1", - "express": "^4.21.0", "fastify": "^5.0.0", "file-type": "^18.0.0", "lodash": "^4.17.21", - "mathjs": "^12.4.0", - "mime-types": "^2.1.35", - "moment-timezone": "^0.5.39", "node-fetch": "^3.3.0", "node-worker-threads-pool": "^1.5.1", "pb-text-format-to-json": "^1.1.1", - "pg": "^8.8.0", "sharp": "^0.33.4", "uuid": "^9.0.0", "uuid-by-string": "^4.0.0", @@ -64,22 +54,12 @@ "@eslint/config-inspector": "^0.5.4", "@stylistic/eslint-plugin": "^2.8.0", "@stylistic/eslint-plugin-ts": "^2.8.0", - "@types/bent": "^7.3.2", "@types/chalk": "^2.2.0", "@types/color": "^3.0.3", - "@types/color-convert": "^2.0.0", - "@types/config": "^3.3.5", - "@types/delta-e": "^0.0.2", - "@types/express": "^4.17.13", "@types/lodash": "^4.14.199", - "@types/mime-types": "^2.1.1", "@types/node": "^16.11.38", "@types/node-fetch": "^2.6.2", - "@types/node-sass": "^4.11.2", - "@types/parsimmon": "^1.10.6", - "@types/pg": "^8.6.5", "@types/uuid": "^9.0.8", - "@types/ws": "^8.5.4", "@typescript-eslint/eslint-plugin": "^8.6.0", "@typescript-eslint/parser": "^8.6.0", "del-cli": "^5.1.0", diff --git a/api/yarn.lock b/api/yarn.lock index 76e11cb..dbad5ac 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -24,13 +24,6 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/runtime@^7.23.9": - version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e" - integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw== - dependencies: - regenerator-runtime "^0.14.0" - "@colors/colors@1.6.0", "@colors/colors@^1.6.0": version "1.6.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" @@ -530,21 +523,6 @@ resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== -"@types/bent@^7.3.2": - version "7.3.8" - resolved "https://registry.yarnpkg.com/@types/bent/-/bent-7.3.8.tgz#69c3ee49bf6593d831006794e7bd2f84bb573e58" - integrity sha512-yZ09JA1KsA5Fl6Oh/ahK00+H5bV0qCy2bYnyfiFY42wnaMK4n7IDC6HaFe3WW45Zhnak7iqJBKlWD0nVxzrGWg== - dependencies: - "@types/node" "*" - -"@types/body-parser@*": - version "1.19.5" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4" - integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg== - dependencies: - "@types/connect" "*" - "@types/node" "*" - "@types/chalk@^2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-2.2.0.tgz#b7f6e446f4511029ee8e3f43075fb5b73fbaa0ba" @@ -552,7 +530,7 @@ dependencies: chalk "*" -"@types/color-convert@*", "@types/color-convert@^2.0.0": +"@types/color-convert@*": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.3.tgz#e93f5c991eda87a945058b47044f5f0008b0dce9" integrity sha512-2Q6wzrNiuEvYxVQqhh7sXM2mhIhvZR/Paq4FdsQkOMgWsCIkKvSGj8Le1/XalulrmgOzPMqNa0ix+ePY4hTrfg== @@ -571,68 +549,11 @@ dependencies: "@types/color-convert" "*" -"@types/config@^3.3.5": - version "3.3.5" - resolved "https://registry.yarnpkg.com/@types/config/-/config-3.3.5.tgz#91f0a52b10212b9c4254fb0bbc4bedd77cd389b8" - integrity sha512-itq2HtXQBrNUKwMNZnb9mBRE3T99VYCdl1gjST9rq+9kFaB1iMMGuDeZnP88qid73DnpAMKH9ZolqDpS1Lz7+w== - -"@types/connect@*": - version "3.4.38" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858" - integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug== - dependencies: - "@types/node" "*" - -"@types/delta-e@^0.0.2": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@types/delta-e/-/delta-e-0.0.2.tgz#fa7d1e7d4525b6536fb125334f22343a16277994" - integrity sha512-DLvqCZ+ce6qVLp8HIxx8rrLjog1t0NlSLXOzz2FbYC31xHMSADMEz+MrJTvYTeuHez6Wtm0dDYgGtBY+7Dgf4Q== - -"@types/express-serve-static-core@^4.17.33": - version "4.17.43" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz#10d8444be560cb789c4735aea5eac6e5af45df54" - integrity sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - "@types/send" "*" - -"@types/express@^4.17.13": - version "4.17.21" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" - integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.33" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/http-errors@*": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f" - integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA== - "@types/lodash@^4.14.199": version "4.14.202" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ== -"@types/mime-types@^2.1.1": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.4.tgz#93a1933e24fed4fb9e4adc5963a63efcbb3317a2" - integrity sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w== - -"@types/mime@*": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.4.tgz#2198ac274de6017b44d941e00261d5bc6a0e0a45" - integrity sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw== - -"@types/mime@^1": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690" - integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w== - "@types/minimist@^1.2.2": version "1.2.5" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" @@ -646,13 +567,6 @@ "@types/node" "*" form-data "^4.0.0" -"@types/node-sass@^4.11.2": - version "4.11.7" - resolved "https://registry.yarnpkg.com/@types/node-sass/-/node-sass-4.11.7.tgz#ed60499f596a90e9ab27bf2ca0b68ac3e914ae6f" - integrity sha512-QY0sXZGPRzJ2obo66f9zB6S0Uo9PRdcoPKPbyftSoKXub90s4ut/JK3fYHOqmhYhRRVEB3P5o5rEnq2/bWBdeg== - dependencies: - "@types/node" "*" - "@types/node@*": version "20.11.24" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792" @@ -670,47 +584,6 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== -"@types/parsimmon@^1.10.6": - version "1.10.9" - resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.9.tgz#14e60db223c1d213fea0e15985d480b5cfe1789a" - integrity sha512-O2M2x1w+m7gWLen8i5DOy6tWRnbRcsW6Pke3j3HAsJUrPb4g0MgjksIUm2aqUtCYxy7Qjr3CzjjwQBzhiGn46A== - -"@types/pg@^8.6.5": - version "8.11.2" - resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.11.2.tgz#e5c306601d2e0cc54c0801cc61a41761c8a95c92" - integrity sha512-G2Mjygf2jFMU/9hCaTYxJrwdObdcnuQde1gndooZSOHsNSaCehAuwc7EIuSA34Do8Jx2yZ19KtvW8P0j4EuUXw== - dependencies: - "@types/node" "*" - pg-protocol "*" - pg-types "^4.0.1" - -"@types/qs@*": - version "6.9.11" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda" - integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ== - -"@types/range-parser@*": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" - integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== - -"@types/send@*": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" - integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/serve-static@*": - version "1.15.5" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.5.tgz#15e67500ec40789a1e8c9defc2d32a896f05b033" - integrity sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ== - dependencies: - "@types/http-errors" "*" - "@types/mime" "*" - "@types/node" "*" - "@types/triple-beam@^1.3.2": version "1.3.5" resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" @@ -721,13 +594,6 @@ resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba" integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA== -"@types/ws@^8.5.4": - version "8.5.10" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787" - integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A== - dependencies: - "@types/node" "*" - "@typescript-eslint/eslint-plugin@8.6.0", "@typescript-eslint/eslint-plugin@^8.6.0": version "8.6.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.6.0.tgz#20049754ff9f6d3a09bf240297f029ce04290999" @@ -833,14 +699,6 @@ abstract-logging@^2.0.1: resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== -accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -948,11 +806,6 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== - arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -996,24 +849,6 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== -body-parser@1.20.3: - version "1.20.3" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" - integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== - dependencies: - bytes "3.1.2" - content-type "~1.0.5" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.13.0" - raw-body "2.5.2" - type-is "~1.6.18" - unpipe "1.0.0" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1050,11 +885,6 @@ buffer-image-size@^0.6.4: dependencies: "@types/node" "*" -buffer-writer@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" - integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== - buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" @@ -1077,27 +907,11 @@ bundle-require@^5.0.0: dependencies: load-tsconfig "^0.2.3" -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - cac@^6.7.14: version "6.7.14" resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959" integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ== -call-bind@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" - integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.4" - set-function-length "^1.2.1" - callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -1127,20 +941,12 @@ canvas@2.11.2: nan "^2.17.0" simple-get "^3.0.3" -cat-loggr@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cat-loggr/-/cat-loggr-1.2.2.tgz#2496fc66e87665a65a1334e60a7a138bbb96c46e" - integrity sha512-4CiRwzPZ4E5/1XX+zgu4cxUZ0otElnSYUjx5KZO+ZhthGUSH5ly7UrMXqcYHC/yep+pv1HhXJAP8KkCPt7G2AA== - dependencies: - chalk "^2.4.1" - dayjs "^1.10.5" - chalk@*, chalk@^5.1.2: version "5.3.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== -chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1252,11 +1058,6 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -complex.js@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.1.1.tgz#0675dac8e464ec431fb2ab7d30f41d889fb25c31" - integrity sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -1267,13 +1068,6 @@ confbox@^0.1.7: resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579" integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA== -config@^3.3.12: - version "3.3.12" - resolved "https://registry.yarnpkg.com/config/-/config-3.3.12.tgz#a10ae66efcc3e48c1879fbb657c86c4ef6c7b25e" - integrity sha512-Vmx389R/QVM3foxqBzXO8t2tUikYZP64Q6vQxGrsMpREeJc/aWRnPRERXWsYzOHAumx/AOoILWe6nU3ZJL+6Sw== - dependencies: - json5 "^2.2.3" - consola@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f" @@ -1284,29 +1078,12 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4, content-type@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" - integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== - cookie-es@^1.1.0: version "1.2.2" resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.2.2.tgz#18ceef9eb513cac1cb6c14bcbf8bdb2679b34821" integrity sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg== -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== - -cookie@0.6.0, cookie@^0.6.0: +cookie@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== @@ -1330,18 +1107,6 @@ data-uri-to-buffer@^4.0.0: resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e" integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A== -dayjs@^1.10.5, dayjs@^1.11.6: - version "1.11.10" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0" - integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== - -debug@2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - debug@4, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -1381,11 +1146,6 @@ decamelize@^5.0.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== -decimal.js@^10.4.3: - version "10.4.3" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" - integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== - decompress-response@^4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" @@ -1411,15 +1171,6 @@ default-browser@^5.2.1: bundle-name "^4.1.0" default-browser-id "^5.0.0" -define-data-property@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" - integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - gopd "^1.0.1" - define-lazy-prop@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" @@ -1462,26 +1213,11 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -delta-e@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/delta-e/-/delta-e-0.0.8.tgz#ad2097846fb5d3f1d8aa4668005adabc8c7cffb9" - integrity sha512-xIggbz7AoZLjwyV+BatfsKhWB1ejeh6vabM4KTJ2e7/d+TS0f7s87aUfkJ7B+MfniM6DD5VOWWlqcKXksp5mIg== - -depd@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - destr@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.3.tgz#7f9e97cb3d16dbdca7be52aca1644ce402cfe449" integrity sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ== -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - detect-libc@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" @@ -1511,16 +1247,6 @@ dotenv@^16.0.3: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - -emoji-regex@^10.2.1: - version "10.3.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23" - integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1531,23 +1257,6 @@ enabled@2.0.x: resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - -encodeurl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" - integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== - -envalid@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/envalid/-/envalid-7.3.1.tgz#5bf6bbb4effab2d64a1991d8078b4ae38924f0d2" - integrity sha512-KL1YRwn8WcoF/Ty7t+yLLtZol01xr9ZJMTjzoGRM8NaSU+nQQjSWOQKKJhJP2P57bpdakJ9jbxqQX4fGTOicZg== - dependencies: - tslib "2.3.1" - eris@^0.17.1: version "0.17.2" resolved "https://registry.yarnpkg.com/eris/-/eris-0.17.2.tgz#927542885b3b2ba6b14fffaaac85aa7ba02dc2ed" @@ -1565,18 +1274,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" - integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== - dependencies: - get-intrinsic "^1.2.4" - -es-errors@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" - integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== - esbuild@^0.21.5: version "0.21.5" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" @@ -1606,16 +1303,6 @@ esbuild@^0.21.5: "@esbuild/win32-ia32" "0.21.5" "@esbuild/win32-x64" "0.21.5" -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - -escape-latex@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/escape-latex/-/escape-latex-1.2.0.tgz#07c03818cf7dac250cce517f4fda1b001ef2bca1" - integrity sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw== - escape-string-regexp@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" @@ -1747,11 +1434,6 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== - event-target-shim@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" @@ -1762,43 +1444,6 @@ events@^3.3.0: resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -express@^4.21.0: - version "4.21.0" - resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" - integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.20.3" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.6.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "2.0.0" - encodeurl "~2.0.0" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.3.1" - fresh "0.5.2" - http-errors "2.0.0" - merge-descriptors "1.0.3" - methods "~1.1.2" - on-finished "2.4.1" - parseurl "~1.3.3" - path-to-regexp "0.1.10" - proxy-addr "~2.0.7" - qs "6.13.0" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.19.0" - serve-static "1.16.2" - setprototypeof "1.2.0" - statuses "2.0.1" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - fast-decode-uri-component@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" @@ -1936,19 +1581,6 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" - integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== - dependencies: - debug "2.6.9" - encodeurl "~2.0.0" - escape-html "~1.0.3" - on-finished "2.4.1" - parseurl "~1.3.3" - statuses "2.0.1" - unpipe "~1.0.0" - find-my-way@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-9.0.1.tgz#991c3a7af36734480d48cd4ad0889ed168ed6c40" @@ -2014,16 +1646,6 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== -fraction.js@4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.4.tgz#b2bac8249a610c3396106da97c5a71da75b94b1c" - integrity sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -2061,27 +1683,6 @@ gauge@^3.0.0: strip-ansi "^6.0.1" wide-align "^1.1.2" -get-intrinsic@^1.1.3, get-intrinsic@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" - integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== - dependencies: - function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - -get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" - integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== - dependencies: - es-errors "^1.3.0" - function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - get-port-please@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.2.tgz#502795e56217128e4183025c89a48c71652f4e49" @@ -2136,13 +1737,6 @@ globby@^13.1.2: merge2 "^1.4.1" slash "^4.0.0" -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - graceful-fs@^4.2.10: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" @@ -2184,23 +1778,6 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" - integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== - dependencies: - get-intrinsic "^1.2.2" - -has-proto@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" - integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== - -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -2227,17 +1804,6 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -2246,13 +1812,6 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" @@ -2294,7 +1853,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.3: +inherits@2, inherits@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2411,11 +1970,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -javascript-natural-sort@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" - integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== - js-md5@^0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2" @@ -2470,11 +2024,6 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== -json5@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" - integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== - keyv@^4.5.4: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" @@ -2579,26 +2128,6 @@ map-obj@^4.1.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -mathjs@^12.4.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-12.4.0.tgz#875c2ec19e5be69885b29769f78bbb37220322b6" - integrity sha512-4Moy0RNjwMSajEkGGxNUyMMC/CZAcl87WBopvNsJWB4E4EFebpTedr+0/rhqmnOSTH3Wu/3WfiWiw6mqiaHxVw== - dependencies: - "@babel/runtime" "^7.23.9" - complex.js "^2.1.1" - decimal.js "^10.4.3" - escape-latex "^1.2.0" - fraction.js "4.3.4" - javascript-natural-sort "^0.7.1" - seedrandom "^3.0.5" - tiny-emitter "^2.1.0" - typed-function "^4.1.1" - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== - meow@^10.1.3: version "10.1.5" resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f" @@ -2617,21 +2146,11 @@ meow@^10.1.3: type-fest "^1.2.2" yargs-parser "^20.2.9" -merge-descriptors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" - integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== - merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== - micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" @@ -2645,18 +2164,13 @@ mime-db@1.52.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.35, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.12: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - mime@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" @@ -2730,34 +2244,17 @@ mlly@^1.7.1: pkg-types "^1.1.1" ufo "^1.5.3" -moment-timezone@^0.5.39: - version "0.5.45" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c" - integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ== - dependencies: - moment "^2.29.4" - -moment@^2.29.4: - version "2.30.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" - integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== - mrmime@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4" integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.1.1, ms@^2.1.3: +ms@^2.1.1, ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -2772,11 +2269,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - node-domexception@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" @@ -2845,16 +2337,6 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" - integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== - -obuf@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - ohash@^1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.4.tgz#ae8d83014ab81157d2c285abf7792e2995fadd72" @@ -2865,13 +2347,6 @@ on-exit-leak-free@^2.1.0: resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8" integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA== -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - once@^1.3.0, once@^1.3.1: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -2948,11 +2423,6 @@ p-map@^5.5.0: dependencies: aggregate-error "^4.0.0" -packet-reader@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" - integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -2970,11 +2440,6 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - parsimmon@^1.16.0: version "1.18.1" resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.18.1.tgz#d8dd9c28745647d02fc6566f217690897eed7709" @@ -3005,11 +2470,6 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-to-regexp@0.1.10: - version "0.1.10" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" - integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -3032,82 +2492,6 @@ peek-readable@^5.0.0: resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.0.0.tgz#7ead2aff25dc40458c60347ea76cfdfd63efdfec" integrity sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A== -pg-cloudflare@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98" - integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q== - -pg-connection-string@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.6.2.tgz#713d82053de4e2bd166fab70cd4f26ad36aab475" - integrity sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA== - -pg-int8@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" - integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== - -pg-numeric@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pg-numeric/-/pg-numeric-1.0.2.tgz#816d9a44026086ae8ae74839acd6a09b0636aa3a" - integrity sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw== - -pg-pool@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.6.1.tgz#5a902eda79a8d7e3c928b77abf776b3cb7d351f7" - integrity sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og== - -pg-protocol@*, pg-protocol@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.6.0.tgz#4c91613c0315349363af2084608db843502f8833" - integrity sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q== - -pg-types@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" - integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== - dependencies: - pg-int8 "1.0.1" - postgres-array "~2.0.0" - postgres-bytea "~1.0.0" - postgres-date "~1.0.4" - postgres-interval "^1.1.0" - -pg-types@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-4.0.2.tgz#399209a57c326f162461faa870145bb0f918b76d" - integrity sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng== - dependencies: - pg-int8 "1.0.1" - pg-numeric "1.0.2" - postgres-array "~3.0.1" - postgres-bytea "~3.0.0" - postgres-date "~2.1.0" - postgres-interval "^3.0.0" - postgres-range "^1.1.1" - -pg@^8.8.0: - version "8.11.3" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.11.3.tgz#d7db6e3fe268fcedd65b8e4599cda0b8b4bf76cb" - integrity sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g== - dependencies: - buffer-writer "2.0.0" - packet-reader "1.0.0" - pg-connection-string "^2.6.2" - pg-pool "^3.6.1" - pg-protocol "^1.6.0" - pg-types "^2.1.0" - pgpass "1.x" - optionalDependencies: - pg-cloudflare "^1.1.1" - -pgpass@1.x: - version "1.0.5" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d" - integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug== - dependencies: - split2 "^4.1.0" - picocolors@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" @@ -3162,55 +2546,6 @@ pkg-types@^1.1.1: mlly "^1.7.1" pathe "^1.1.2" -postgres-array@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" - integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== - -postgres-array@~3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-3.0.2.tgz#68d6182cb0f7f152a7e60dc6a6889ed74b0a5f98" - integrity sha512-6faShkdFugNQCLwucjPcY5ARoW1SlbnrZjmGl0IrrqewpvxvhSLHimCVzqeuULCbG0fQv7Dtk1yDbG3xv7Veog== - -postgres-bytea@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" - integrity sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w== - -postgres-bytea@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-3.0.0.tgz#9048dc461ac7ba70a6a42d109221619ecd1cb089" - integrity sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw== - dependencies: - obuf "~1.1.2" - -postgres-date@~1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" - integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== - -postgres-date@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-2.1.0.tgz#b85d3c1fb6fb3c6c8db1e9942a13a3bf625189d0" - integrity sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA== - -postgres-interval@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695" - integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ== - dependencies: - xtend "^4.0.0" - -postgres-interval@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-3.0.0.tgz#baf7a8b3ebab19b7f38f07566c7aab0962f0c86a" - integrity sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw== - -postgres-range@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/postgres-range/-/postgres-range-1.1.4.tgz#a59c5f9520909bcec5e63e8cf913a92e4c952863" - integrity sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w== - prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -3233,7 +2568,7 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -proxy-addr@^2.0.7, proxy-addr@~2.0.7: +proxy-addr@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== @@ -3246,13 +2581,6 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -qs@6.13.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" - integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== - dependencies: - side-channel "^1.0.6" - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -3273,21 +2601,6 @@ radix3@^1.1.2: resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.2.tgz#fd27d2af3896c6bf4bcdfab6427c69c2afc69ec0" integrity sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA== -range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" - integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - read-pkg-up@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670" @@ -3354,11 +2667,6 @@ redent@^4.0.0: indent-string "^5.0.0" strip-indent "^4.0.0" -regenerator-runtime@^0.14.0: - version "0.14.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" - integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== - require-from-string@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" @@ -3422,7 +2730,7 @@ run-parallel@^1.1.9, run-parallel@^1.2.0: dependencies: queue-microtask "^1.2.2" -safe-buffer@5.2.1, safe-buffer@~5.2.0: +safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -3439,21 +2747,11 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd" integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA== -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - secure-json-parse@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862" integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== -seedrandom@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7" - integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg== - semver@^6.0.0: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" @@ -3471,35 +2769,6 @@ semver@^7.6.0, semver@^7.6.3: resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -send@0.19.0: - version "0.19.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" - integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" - -serve-static@1.16.2: - version "1.16.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" - integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== - dependencies: - encodeurl "~2.0.0" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.19.0" - set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -3510,23 +2779,6 @@ set-cookie-parser@^2.6.0: resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.0.tgz#ef5552b56dc01baae102acb5fc9fb8cd060c30f9" integrity sha512-lXLOiqpkUumhRdFF3k1osNXCy9akgx/dyPZ5p8qAg9seJzXr5ZrlqZuWIMuY6ejOsVLE6flJ5/h3lsn57fQ/PQ== -set-function-length@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" - integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== - dependencies: - define-data-property "^1.1.2" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.3" - gopd "^1.0.1" - has-property-descriptors "^1.0.1" - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - sharp@^0.33.4: version "0.33.5" resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.5.tgz#13e0e4130cc309d6a9497596715240b2ec0c594e" @@ -3568,16 +2820,6 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -side-channel@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" - integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== - dependencies: - call-bind "^1.0.7" - es-errors "^1.3.0" - get-intrinsic "^1.2.4" - object-inspect "^1.13.1" - signal-exit@^3.0.0: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" @@ -3642,7 +2884,7 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== -split2@^4.0.0, split2@^4.1.0: +split2@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== @@ -3657,11 +2899,6 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -3753,11 +2990,6 @@ thread-stream@^3.0.0: dependencies: real-require "^0.2.0" -tiny-emitter@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -3770,11 +3002,6 @@ toad-cache@^3.7.0: resolved "https://registry.yarnpkg.com/toad-cache/-/toad-cache-3.7.0.tgz#b9b63304ea7c45ec34d91f1d2fa513517025c441" integrity sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw== -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - token-types@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/token-types/-/token-types-5.0.1.tgz#aa9d9e6b23c420a675e55413b180635b86a093b4" @@ -3803,11 +3030,6 @@ ts-api-utils@^1.3.0: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== -tslib@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - tslib@^2.4.0: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" @@ -3835,19 +3057,6 @@ type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typed-function@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-4.1.1.tgz#38ce3cae31f4f513bcb263563fdad27b2afa73e8" - integrity sha512-Pq1DVubcvibmm8bYcMowjVnnMwPVMeh0DIdA8ad8NZY2sJgapANJmiigSUwlt+EgXxpfIv8MWrQXTIzkfYZLYQ== - typescript-eslint@^8.6.0: version "8.6.0" resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.6.0.tgz#5f0b5e23b34385ef146e447616c1a0d6bd14bedb" @@ -3893,11 +3102,6 @@ unicorn-magic@^0.1.0: resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4" integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ== -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -3910,11 +3114,6 @@ util-deprecate@^1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - uuid-by-string@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/uuid-by-string/-/uuid-by-string-4.0.0.tgz#1d6da2154294368ae85d3853e4c895cfa52c1179" @@ -3936,11 +3135,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - web-streams-polyfill@^3.0.3: version "3.3.2" resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz#32e26522e05128203a7de59519be3c648004343b" @@ -4019,11 +3213,6 @@ ws@^8.2.3: resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== -xtend@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" From 7f496b8cbad70cf86466fd724d906dfc75183fda Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 25 Sep 2024 13:12:42 +0200 Subject: [PATCH 19/24] Yarn update --- api/.gitignore | 7 + api/.yarnrc.yml | 1 + api/package.json | 4 +- api/yarn.lock | 8248 ++++++++++++++++++++++++++++------------------ 4 files changed, 5024 insertions(+), 3236 deletions(-) create mode 100644 api/.yarnrc.yml diff --git a/api/.gitignore b/api/.gitignore index 46f440c..3ff3afb 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -5,6 +5,13 @@ # NPM and yarn node_modules yarn-error.log +.yarn/* +!.yarn/cache +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions # Config files config.json diff --git a/api/.yarnrc.yml b/api/.yarnrc.yml new file mode 100644 index 0000000..3186f3f --- /dev/null +++ b/api/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/api/package.json b/api/package.json index f16dc7f..aa14b25 100644 --- a/api/package.json +++ b/api/package.json @@ -21,7 +21,7 @@ "lint:inspect": "yarn dlx @eslint/config-inspector@latest" }, "dependencies": { - "@prisma/client": "^5.10.2", + "@prisma/client": "5.20.0", "@sinclair/typebox": "^0.33.12", "buffer-image-size": "^0.6.4", "canvas": "2.11.2", @@ -65,7 +65,7 @@ "del-cli": "^5.1.0", "eslint": "^9.0.0", "eslint-plugin-import-x": "^4.2.1", - "prisma": "^5.10.2", + "prisma": "5.20.0", "typescript": "^5.6.2", "typescript-eslint": "^8.6.0" }, diff --git a/api/yarn.lock b/api/yarn.lock index dbad5ac..7d3e796 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -1,3234 +1,5014 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@^7.0.0": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== - dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" - -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== - dependencies: - "@babel/helper-validator-identifier" "^7.22.20" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@colors/colors@1.6.0", "@colors/colors@^1.6.0": - version "1.6.0" - resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" - integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== - -"@dabh/diagnostics@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" - integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA== - dependencies: - colorspace "1.1.x" - enabled "2.0.x" - kuler "^2.0.0" - -"@emnapi/runtime@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.2.0.tgz#71d018546c3a91f3b51106530edbc056b9f2f2e3" - integrity sha512-bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ== - dependencies: - tslib "^2.4.0" - -"@esbuild/aix-ppc64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" - integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== - -"@esbuild/android-arm64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" - integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== - -"@esbuild/android-arm@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" - integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== - -"@esbuild/android-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" - integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== - -"@esbuild/darwin-arm64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" - integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== - -"@esbuild/darwin-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" - integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== - -"@esbuild/freebsd-arm64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" - integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== - -"@esbuild/freebsd-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" - integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== - -"@esbuild/linux-arm64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" - integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== - -"@esbuild/linux-arm@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" - integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== - -"@esbuild/linux-ia32@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" - integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== - -"@esbuild/linux-loong64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" - integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== - -"@esbuild/linux-mips64el@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" - integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== - -"@esbuild/linux-ppc64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" - integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== - -"@esbuild/linux-riscv64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" - integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== - -"@esbuild/linux-s390x@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" - integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== - -"@esbuild/linux-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" - integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== - -"@esbuild/netbsd-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" - integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== - -"@esbuild/openbsd-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" - integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== - -"@esbuild/sunos-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" - integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== - -"@esbuild/win32-arm64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" - integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== - -"@esbuild/win32-ia32@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" - integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== - -"@esbuild/win32-x64@0.21.5": - version "0.21.5" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" - integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== - -"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== - dependencies: - eslint-visitor-keys "^3.3.0" - -"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.1.tgz#a547badfc719eb3e5f4b556325e542fbe9d7a18f" - integrity sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q== - -"@eslint/config-array@^0.17.1": - version "0.17.1" - resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.17.1.tgz#d9b8b8b6b946f47388f32bedfd3adf29ca8f8910" - integrity sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA== - dependencies: - "@eslint/object-schema" "^2.1.4" - debug "^4.3.1" - minimatch "^3.1.2" - -"@eslint/config-array@^0.18.0": - version "0.18.0" - resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d" - integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw== - dependencies: - "@eslint/object-schema" "^2.1.4" - debug "^4.3.1" - minimatch "^3.1.2" - -"@eslint/config-inspector@^0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@eslint/config-inspector/-/config-inspector-0.5.4.tgz#403fe1bcadff0d490ca48ff1926f0eb663c1c5de" - integrity sha512-WB/U/B6HdRiIt/CfbcqqFp7Svz+3INLtnGcuMT2hnU39S3cb9JGGkvB1T6lbIlDoQ9VRnhc4riIFFoicGRZ2mw== - dependencies: - "@eslint/config-array" "^0.17.1" - "@voxpelli/config-array-find-files" "^0.1.2" - bundle-require "^5.0.0" - cac "^6.7.14" - chokidar "^3.6.0" - esbuild "^0.21.5" - fast-glob "^3.3.2" - find-up "^7.0.0" - get-port-please "^3.1.2" - h3 "^1.12.0" - minimatch "^9.0.5" - mlly "^1.7.1" - mrmime "^2.0.0" - open "^10.1.0" - picocolors "^1.0.1" - ws "^8.18.0" - -"@eslint/eslintrc@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6" - integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^10.0.1" - globals "^14.0.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@eslint/js@9.10.0": - version "9.10.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.10.0.tgz#eaa3cb0baec497970bb29e43a153d0d5650143c6" - integrity sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g== - -"@eslint/object-schema@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" - integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== - -"@eslint/plugin-kit@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz#809b95a0227ee79c3195adfb562eb94352e77974" - integrity sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ== - dependencies: - levn "^0.4.1" - -"@fastify/ajv-compiler@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@fastify/ajv-compiler/-/ajv-compiler-4.0.0.tgz#9f5852461473d7f6267f7275b7cb0afc365317cc" - integrity sha512-dt0jyLAlay14LpIn4Fg1SY7V5NJ9KH0YFDpYVQY5cgIVBvdI8908AMx5zQ0bBYPGT6Wh+bM3f2caMmOXLP3QsQ== - dependencies: - ajv "^8.12.0" - ajv-formats "^3.0.1" - fast-uri "^3.0.0" - -"@fastify/error@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@fastify/error/-/error-4.0.0.tgz#7842d6161fbce78953638318be99033a0c2d5070" - integrity sha512-OO/SA8As24JtT1usTUTKgGH7uLvhfwZPwlptRi2Dp5P4KKmJI3gvsZ8MIHnNwDs4sLf/aai5LzTyl66xr7qMxA== - -"@fastify/fast-json-stringify-compiler@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-5.0.1.tgz#659c74f3181fb4f984fe27dcc95d14366ae85ca0" - integrity sha512-f2d3JExJgFE3UbdFcpPwqNUEoHWmt8pAKf8f+9YuLESdefA0WgqxeT6DrGL4Yrf/9ihXNSKOqpjEmurV405meA== - dependencies: - fast-json-stringify "^6.0.0" - -"@fastify/merge-json-schemas@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz#3551857b8a17a24e8c799e9f51795edb07baa0bc" - integrity sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA== - dependencies: - fast-deep-equal "^3.1.3" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/retry@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" - integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== - -"@img/sharp-darwin-arm64@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz#ef5b5a07862805f1e8145a377c8ba6e98813ca08" - integrity sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ== - optionalDependencies: - "@img/sharp-libvips-darwin-arm64" "1.0.4" - -"@img/sharp-darwin-x64@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz#e03d3451cd9e664faa72948cc70a403ea4063d61" - integrity sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q== - optionalDependencies: - "@img/sharp-libvips-darwin-x64" "1.0.4" - -"@img/sharp-libvips-darwin-arm64@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz#447c5026700c01a993c7804eb8af5f6e9868c07f" - integrity sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg== - -"@img/sharp-libvips-darwin-x64@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz#e0456f8f7c623f9dbfbdc77383caa72281d86062" - integrity sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ== - -"@img/sharp-libvips-linux-arm64@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz#979b1c66c9a91f7ff2893556ef267f90ebe51704" - integrity sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA== - -"@img/sharp-libvips-linux-arm@1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz#99f922d4e15216ec205dcb6891b721bfd2884197" - integrity sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g== - -"@img/sharp-libvips-linux-s390x@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz#f8a5eb1f374a082f72b3f45e2fb25b8118a8a5ce" - integrity sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA== - -"@img/sharp-libvips-linux-x64@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz#d4c4619cdd157774906e15770ee119931c7ef5e0" - integrity sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw== - -"@img/sharp-libvips-linuxmusl-arm64@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz#166778da0f48dd2bded1fa3033cee6b588f0d5d5" - integrity sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA== - -"@img/sharp-libvips-linuxmusl-x64@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz#93794e4d7720b077fcad3e02982f2f1c246751ff" - integrity sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw== - -"@img/sharp-linux-arm64@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz#edb0697e7a8279c9fc829a60fc35644c4839bb22" - integrity sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA== - optionalDependencies: - "@img/sharp-libvips-linux-arm64" "1.0.4" - -"@img/sharp-linux-arm@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz#422c1a352e7b5832842577dc51602bcd5b6f5eff" - integrity sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ== - optionalDependencies: - "@img/sharp-libvips-linux-arm" "1.0.5" - -"@img/sharp-linux-s390x@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz#f5c077926b48e97e4a04d004dfaf175972059667" - integrity sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q== - optionalDependencies: - "@img/sharp-libvips-linux-s390x" "1.0.4" - -"@img/sharp-linux-x64@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz#d806e0afd71ae6775cc87f0da8f2d03a7c2209cb" - integrity sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA== - optionalDependencies: - "@img/sharp-libvips-linux-x64" "1.0.4" - -"@img/sharp-linuxmusl-arm64@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz#252975b915894fb315af5deea174651e208d3d6b" - integrity sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g== - optionalDependencies: - "@img/sharp-libvips-linuxmusl-arm64" "1.0.4" - -"@img/sharp-linuxmusl-x64@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz#3f4609ac5d8ef8ec7dadee80b560961a60fd4f48" - integrity sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw== - optionalDependencies: - "@img/sharp-libvips-linuxmusl-x64" "1.0.4" - -"@img/sharp-wasm32@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz#6f44f3283069d935bb5ca5813153572f3e6f61a1" - integrity sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg== - dependencies: - "@emnapi/runtime" "^1.2.0" - -"@img/sharp-win32-ia32@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz#1a0c839a40c5351e9885628c85f2e5dfd02b52a9" - integrity sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ== - -"@img/sharp-win32-x64@0.33.5": - version "0.33.5" - resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342" - integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg== - -"@mapbox/node-pre-gyp@^1.0.0": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz#417db42b7f5323d79e93b34a6d7a2a12c0df43fa" - integrity sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ== - dependencies: - detect-libc "^2.0.0" - https-proxy-agent "^5.0.0" - make-dir "^3.1.0" - node-fetch "^2.6.7" - nopt "^5.0.0" - npmlog "^5.0.1" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.11" - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.scandir@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-3.0.0.tgz#91c0a33e1aeaedcd4bab2bf31be5d1962a55d2a7" - integrity sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg== - dependencies: - "@nodelib/fs.stat" "3.0.0" - run-parallel "^1.2.0" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.stat@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-3.0.0.tgz#ef6c829f2b05f42595d88854ebd777d4335ff0a9" - integrity sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ== - -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@nodelib/fs.walk@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-2.0.0.tgz#10499ac2210f6399770b465ba728adafc7d44bb1" - integrity sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A== - dependencies: - "@nodelib/fs.scandir" "3.0.0" - fastq "^1.15.0" - -"@prisma/client@^5.10.2": - version "5.10.2" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.10.2.tgz#e087b40a4de8e3171eb9cbf0a873465cd2068e17" - integrity sha512-ef49hzB2yJZCvM5gFHMxSFL9KYrIP9udpT5rYo0CsHD4P9IKj473MbhU1gjKKftiwWBTIyrt9jukprzZXazyag== - -"@prisma/debug@5.10.2": - version "5.10.2" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.10.2.tgz#74be81d8969978f4d53c1b4e76d61f04bfbc3951" - integrity sha512-bkBOmH9dpEBbMKFJj8V+Zp8IZHIBjy3fSyhLhxj4FmKGb/UBSt9doyfA6k1UeUREsMJft7xgPYBbHSOYBr8XCA== - -"@prisma/engines-version@5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9": - version "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9.tgz#1502335d4d72d2014cb25b8ad8a740a3a13400ea" - integrity sha512-uCy/++3Jx/O3ufM+qv2H1L4tOemTNqcP/gyEVOlZqTpBvYJUe0tWtW0y3o2Ueq04mll4aM5X3f6ugQftOSLdFQ== - -"@prisma/engines@5.10.2": - version "5.10.2" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.10.2.tgz#a4851d90f76ad6d22e783d5fd2e2e8c0640f1e81" - integrity sha512-HkSJvix6PW8YqEEt3zHfCYYJY69CXsNdhU+wna+4Y7EZ+AwzeupMnUThmvaDA7uqswiHkgm5/SZ6/4CStjaGmw== - dependencies: - "@prisma/debug" "5.10.2" - "@prisma/engines-version" "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" - "@prisma/fetch-engine" "5.10.2" - "@prisma/get-platform" "5.10.2" - -"@prisma/fetch-engine@5.10.2": - version "5.10.2" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.10.2.tgz#a061f6727d395c7033b55f9c6e92f8741a70d5c5" - integrity sha512-dSmXcqSt6DpTmMaLQ9K8ZKzVAMH3qwGCmYEZr/uVnzVhxRJ1EbT/w2MMwIdBNq1zT69Rvh0h75WMIi0mrIw7Hg== - dependencies: - "@prisma/debug" "5.10.2" - "@prisma/engines-version" "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" - "@prisma/get-platform" "5.10.2" - -"@prisma/get-platform@5.10.2": - version "5.10.2" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.10.2.tgz#7af97b1d82e5574a474e3fbf6eaf04f4156bc535" - integrity sha512-nqXP6vHiY2PIsebBAuDeWiUYg8h8mfjBckHh6Jezuwej0QJNnjDiOq30uesmg+JXxGk99nqyG3B7wpcOODzXvg== - dependencies: - "@prisma/debug" "5.10.2" - -"@sinclair/typebox@^0.33.12": - version "0.33.12" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.33.12.tgz#1feac782bc50dc02733ad3d63964035dd3fe8ba7" - integrity sha512-d5KrXIdPolLp8VpGpZAQvEz8ioVtFlUQSyCIS2sEBi7FKhceIB7nj9BlNfqqvp5wmOfg8v8bP1rAvYYkjz21/Q== - -"@stylistic/eslint-plugin-ts@^2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.8.0.tgz#b45029af65ecfa7cc28ff42238d55c0f55f7dbf8" - integrity sha512-VukJqkRlC2psLKoIHJ+4R3ZxLJfWeizGGX+X5ZxunjXo4MbxRNtwu5UvXuerABg4s2RV6Z3LFTdm0WvI4+RAMQ== - dependencies: - "@typescript-eslint/utils" "^8.4.0" - eslint-visitor-keys "^4.0.0" - espree "^10.1.0" - -"@stylistic/eslint-plugin@^2.8.0": - version "2.8.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-2.8.0.tgz#9fcbcf8b4b27cc3867eedce37b8c8fded1010107" - integrity sha512-Ufvk7hP+bf+pD35R/QfunF793XlSRIC7USr3/EdgduK9j13i2JjmsM0LUz3/foS+jDYp2fzyWZA9N44CPur0Ow== - dependencies: - "@typescript-eslint/utils" "^8.4.0" - eslint-visitor-keys "^4.0.0" - espree "^10.1.0" - estraverse "^5.3.0" - picomatch "^4.0.2" - -"@tokenizer/token@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" - integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== - -"@types/chalk@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-2.2.0.tgz#b7f6e446f4511029ee8e3f43075fb5b73fbaa0ba" - integrity sha512-1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw== - dependencies: - chalk "*" - -"@types/color-convert@*": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.3.tgz#e93f5c991eda87a945058b47044f5f0008b0dce9" - integrity sha512-2Q6wzrNiuEvYxVQqhh7sXM2mhIhvZR/Paq4FdsQkOMgWsCIkKvSGj8Le1/XalulrmgOzPMqNa0ix+ePY4hTrfg== - dependencies: - "@types/color-name" "*" - -"@types/color-name@*": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.3.tgz#c488ac2e519c9795faa0d54e8156d54e66adc4e6" - integrity sha512-87W6MJCKZYDhLAx/J1ikW8niMvmGRyY+rpUxWpL1cO7F8Uu5CHuQoFv+R0/L5pgNdW4jTyda42kv60uwVIPjLw== - -"@types/color@^3.0.3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.6.tgz#29c27a99d4de2975e1676712679a0bd7f646a3fb" - integrity sha512-NMiNcZFRUAiUUCCf7zkAelY8eV3aKqfbzyFQlXpPIEeoNDbsEHGpb854V3gzTsGKYj830I5zPuOwU/TP5/cW6A== - dependencies: - "@types/color-convert" "*" - -"@types/lodash@^4.14.199": - version "4.14.202" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" - integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ== - -"@types/minimist@^1.2.2": - version "1.2.5" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" - integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== - -"@types/node-fetch@^2.6.2": - version "2.6.11" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" - integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g== - dependencies: - "@types/node" "*" - form-data "^4.0.0" - -"@types/node@*": - version "20.11.24" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792" - integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long== - dependencies: - undici-types "~5.26.4" - -"@types/node@^16.11.38": - version "16.18.86" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.86.tgz#87426ce3747a4c135229e15765cbf9c5a18d280c" - integrity sha512-QMvdZf+ZTSiv7gspwhqbfB7Y5DmbYgCsUnakS8Ul9uRbJQehDKaM7SL+GbcDS003Lh7VK4YlelHsRm9HCv26eA== - -"@types/normalize-package-data@^2.4.0": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" - integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== - -"@types/triple-beam@^1.3.2": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" - integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw== - -"@types/uuid@^9.0.8": - version "9.0.8" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba" - integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA== - -"@typescript-eslint/eslint-plugin@8.6.0", "@typescript-eslint/eslint-plugin@^8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.6.0.tgz#20049754ff9f6d3a09bf240297f029ce04290999" - integrity sha512-UOaz/wFowmoh2G6Mr9gw60B1mm0MzUtm6Ic8G2yM1Le6gyj5Loi/N+O5mocugRGY+8OeeKmkMmbxNqUCq3B4Sg== - dependencies: - "@eslint-community/regexpp" "^4.10.0" - "@typescript-eslint/scope-manager" "8.6.0" - "@typescript-eslint/type-utils" "8.6.0" - "@typescript-eslint/utils" "8.6.0" - "@typescript-eslint/visitor-keys" "8.6.0" - graphemer "^1.4.0" - ignore "^5.3.1" - natural-compare "^1.4.0" - ts-api-utils "^1.3.0" - -"@typescript-eslint/parser@8.6.0", "@typescript-eslint/parser@^8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.6.0.tgz#02e092b9dc8b4e319172af620d0d39b337d948f6" - integrity sha512-eQcbCuA2Vmw45iGfcyG4y6rS7BhWfz9MQuk409WD47qMM+bKCGQWXxvoOs1DUp+T7UBMTtRTVT+kXr7Sh4O9Ow== - dependencies: - "@typescript-eslint/scope-manager" "8.6.0" - "@typescript-eslint/types" "8.6.0" - "@typescript-eslint/typescript-estree" "8.6.0" - "@typescript-eslint/visitor-keys" "8.6.0" - debug "^4.3.4" - -"@typescript-eslint/scope-manager@8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.6.0.tgz#28cc2fc26a84b75addf45091a2c6283e29e2c982" - integrity sha512-ZuoutoS5y9UOxKvpc/GkvF4cuEmpokda4wRg64JEia27wX+PysIE9q+lzDtlHHgblwUWwo5/Qn+/WyTUvDwBHw== - dependencies: - "@typescript-eslint/types" "8.6.0" - "@typescript-eslint/visitor-keys" "8.6.0" - -"@typescript-eslint/type-utils@8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.6.0.tgz#d4347e637478bef88cee1db691fcfa20ade9b8a0" - integrity sha512-dtePl4gsuenXVwC7dVNlb4mGDcKjDT/Ropsk4za/ouMBPplCLyznIaR+W65mvCvsyS97dymoBRrioEXI7k0XIg== - dependencies: - "@typescript-eslint/typescript-estree" "8.6.0" - "@typescript-eslint/utils" "8.6.0" - debug "^4.3.4" - ts-api-utils "^1.3.0" - -"@typescript-eslint/types@8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.6.0.tgz#cdc3a16f83f2f0663d6723e9fd032331cdd9f51c" - integrity sha512-rojqFZGd4MQxw33SrOy09qIDS8WEldM8JWtKQLAjf/X5mGSeEFh5ixQlxssMNyPslVIk9yzWqXCsV2eFhYrYUw== - -"@typescript-eslint/typescript-estree@8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.6.0.tgz#f945506de42871f04868371cb5bf21e8f7266e01" - integrity sha512-MOVAzsKJIPIlLK239l5s06YXjNqpKTVhBVDnqUumQJja5+Y94V3+4VUFRA0G60y2jNnTVwRCkhyGQpavfsbq/g== - dependencies: - "@typescript-eslint/types" "8.6.0" - "@typescript-eslint/visitor-keys" "8.6.0" - debug "^4.3.4" - fast-glob "^3.3.2" - is-glob "^4.0.3" - minimatch "^9.0.4" - semver "^7.6.0" - ts-api-utils "^1.3.0" - -"@typescript-eslint/utils@8.6.0", "@typescript-eslint/utils@^8.1.0", "@typescript-eslint/utils@^8.4.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.6.0.tgz#175fe893f32804bed1e72b3364ea6bbe1044181c" - integrity sha512-eNp9cWnYf36NaOVjkEUznf6fEgVy1TWpE0o52e4wtojjBx7D1UV2WAWGzR+8Y5lVFtpMLPwNbC67T83DWSph4A== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@typescript-eslint/scope-manager" "8.6.0" - "@typescript-eslint/types" "8.6.0" - "@typescript-eslint/typescript-estree" "8.6.0" - -"@typescript-eslint/visitor-keys@8.6.0": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.6.0.tgz#5432af4a1753f376f35ab5b891fc9db237aaf76f" - integrity sha512-wapVFfZg9H0qOYh4grNVQiMklJGluQrOUiOhYRrQWhx7BY/+I1IYb8BczWNbbUpO+pqy0rDciv3lQH5E1bCLrg== - dependencies: - "@typescript-eslint/types" "8.6.0" - eslint-visitor-keys "^3.4.3" - -"@voxpelli/config-array-find-files@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@voxpelli/config-array-find-files/-/config-array-find-files-0.1.2.tgz#6da222d833e5e49312d195b2fc91026869d46a70" - integrity sha512-jOva73R+0Nc5/pyS/piBSjQzO4EehME7rPSkBpPC9PYSta+yj3OpF14v0m0HLLYLVNuyHbBjQh5QvGIZwTH2eA== - dependencies: - "@nodelib/fs.walk" "^2.0.0" - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - -abstract-logging@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" - integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn@^8.11.3, acorn@^8.12.0: - version "8.12.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" - integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -aggregate-error@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e" - integrity sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w== - dependencies: - clean-stack "^4.0.0" - indent-string "^5.0.0" - -ajv-formats@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578" - integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ== - dependencies: - ajv "^8.0.0" - -ajv@^6.12.4: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ajv@^8.12.0: - version "8.17.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" - integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== - dependencies: - fast-deep-equal "^3.1.3" - fast-uri "^3.0.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@~3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" - integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -"aproba@^1.0.3 || ^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - -are-we-there-yet@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" - integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== - -async@^3.2.3: - version "3.2.6" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" - integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -atomic-sleep@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" - integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== - -avvio@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/avvio/-/avvio-9.0.0.tgz#3ae02fb318377006e0e06a3f47842c98d8668607" - integrity sha512-UbYrOXgE/I+knFG+3kJr9AgC7uNo8DG+FGGODpH9Bj1O1kL/QDjBXnTem9leD3VdQKtaHjV3O85DQ7hHh4IIHw== - dependencies: - "@fastify/error" "^4.0.0" - fastq "^1.17.1" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -binary-extensions@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" - integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -braces@~3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" - integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== - dependencies: - fill-range "^7.1.1" - -buffer-image-size@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/buffer-image-size/-/buffer-image-size-0.6.4.tgz#357e8173e951ced3b5a2785c695993aa29dbcac4" - integrity sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ== - dependencies: - "@types/node" "*" - -buffer@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" - integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.2.1" - -bundle-name@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889" - integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q== - dependencies: - run-applescript "^7.0.0" - -bundle-require@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-5.0.0.tgz#071521bdea6534495cf23e92a83f889f91729e93" - integrity sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w== - dependencies: - load-tsconfig "^0.2.3" - -cac@^6.7.14: - version "6.7.14" - resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959" - integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ== - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase-keys@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252" - integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg== - dependencies: - camelcase "^6.3.0" - map-obj "^4.1.0" - quick-lru "^5.1.1" - type-fest "^1.2.1" - -camelcase@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -canvas@2.11.2: - version "2.11.2" - resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.11.2.tgz#553d87b1e0228c7ac0fc72887c3adbac4abbd860" - integrity sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw== - dependencies: - "@mapbox/node-pre-gyp" "^1.0.0" - nan "^2.17.0" - simple-get "^3.0.3" - -chalk@*, chalk@^5.1.2: - version "5.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chokidar@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" - integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -clean-stack@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31" - integrity sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg== - dependencies: - escape-string-regexp "5.0.0" - -color-convert@^1.9.0, color-convert@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@^1.0.0, color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-string@^1.6.0, color-string@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" - integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color-support@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== - -color@^3.1.3: - version "3.2.1" - resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" - integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== - dependencies: - color-convert "^1.9.3" - color-string "^1.6.0" - -color@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a" - integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A== - dependencies: - color-convert "^2.0.1" - color-string "^1.9.0" - -colorspace@1.1.x: - version "1.1.4" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" - integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== - dependencies: - color "^3.1.3" - text-hex "1.0.x" - -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -confbox@^0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579" - integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA== - -consola@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f" - integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ== - -console-control-strings@^1.0.0, console-control-strings@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - -cookie-es@^1.1.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/cookie-es/-/cookie-es-1.2.2.tgz#18ceef9eb513cac1cb6c14bcbf8bdb2679b34821" - integrity sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg== - -cookie@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" - integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== - -cross-spawn@^7.0.2: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -crossws@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/crossws/-/crossws-0.2.4.tgz#82a8b518bff1018ab1d21ced9e35ffbe1681ad03" - integrity sha512-DAxroI2uSOgUKLz00NX6A8U/8EE3SZHmIND+10jkVSaypvyt57J5JEOxAQOL6lQxyzi/wZbTIwssU1uy69h5Vg== - -data-uri-to-buffer@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e" - integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A== - -debug@4, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@^4.3.1, debug@^4.3.2: - version "4.3.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" - integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== - dependencies: - ms "^2.1.3" - -decamelize-keys@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" - integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg== - dependencies: - decamelize "^1.1.0" - map-obj "^1.0.0" - -decamelize@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== - -decamelize@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" - integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== - -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - -deep-is@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -default-browser-id@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26" - integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA== - -default-browser@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf" - integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg== - dependencies: - bundle-name "^4.1.0" - default-browser-id "^5.0.0" - -define-lazy-prop@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" - integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== - -defu@^6.1.4: - version "6.1.4" - resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479" - integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg== - -del-cli@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-5.1.0.tgz#740eca1c7a9eb13043e68d8a361cf0ff9a18d5c8" - integrity sha512-xwMeh2acluWeccsfzE7VLsG3yTr7nWikbfw+xhMnpRrF15pGSkw+3/vJZWlGoE4I86UiLRNHicmKt4tkIX9Jtg== - dependencies: - del "^7.1.0" - meow "^10.1.3" - -del@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/del/-/del-7.1.0.tgz#0de0044d556b649ff05387f1fa7c885e155fd1b6" - integrity sha512-v2KyNk7efxhlyHpjEvfyxaAihKKK0nWCuf6ZtqZcFFpQRG0bJ12Qsr0RpvsICMjAAZ8DOVCxrlqpxISlMHC4Kg== - dependencies: - globby "^13.1.2" - graceful-fs "^4.2.10" - is-glob "^4.0.3" - is-path-cwd "^3.0.0" - is-path-inside "^4.0.0" - p-map "^5.5.0" - rimraf "^3.0.2" - slash "^4.0.0" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - -destr@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.3.tgz#7f9e97cb3d16dbdca7be52aca1644ce402cfe449" - integrity sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ== - -detect-libc@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d" - integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw== - -detect-libc@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700" - integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw== - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -dotenv@^16.0.3: - version "16.4.5" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" - integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -enabled@2.0.x: - version "2.0.0" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" - integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== - -eris@^0.17.1: - version "0.17.2" - resolved "https://registry.yarnpkg.com/eris/-/eris-0.17.2.tgz#927542885b3b2ba6b14fffaaac85aa7ba02dc2ed" - integrity sha512-OzffDSL81VooFXfRn56ienSg7J6fagoN8WdkmCHjn0B9a4jUA3bVouMztQiaXT54jHV5jaX9D0mJ/b9/0mFoVg== - dependencies: - ws "^8.2.3" - optionalDependencies: - opusscript "^0.0.8" - tweetnacl "^1.0.3" - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -esbuild@^0.21.5: - version "0.21.5" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" - integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw== - optionalDependencies: - "@esbuild/aix-ppc64" "0.21.5" - "@esbuild/android-arm" "0.21.5" - "@esbuild/android-arm64" "0.21.5" - "@esbuild/android-x64" "0.21.5" - "@esbuild/darwin-arm64" "0.21.5" - "@esbuild/darwin-x64" "0.21.5" - "@esbuild/freebsd-arm64" "0.21.5" - "@esbuild/freebsd-x64" "0.21.5" - "@esbuild/linux-arm" "0.21.5" - "@esbuild/linux-arm64" "0.21.5" - "@esbuild/linux-ia32" "0.21.5" - "@esbuild/linux-loong64" "0.21.5" - "@esbuild/linux-mips64el" "0.21.5" - "@esbuild/linux-ppc64" "0.21.5" - "@esbuild/linux-riscv64" "0.21.5" - "@esbuild/linux-s390x" "0.21.5" - "@esbuild/linux-x64" "0.21.5" - "@esbuild/netbsd-x64" "0.21.5" - "@esbuild/openbsd-x64" "0.21.5" - "@esbuild/sunos-x64" "0.21.5" - "@esbuild/win32-arm64" "0.21.5" - "@esbuild/win32-ia32" "0.21.5" - "@esbuild/win32-x64" "0.21.5" - -escape-string-regexp@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8" - integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -eslint-import-resolver-node@^0.3.9: - version "0.3.9" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" - integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== - dependencies: - debug "^3.2.7" - is-core-module "^2.13.0" - resolve "^1.22.4" - -eslint-plugin-import-x@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import-x/-/eslint-plugin-import-x-4.2.1.tgz#575f311d51d960f46609dfa3fea9f027cd0cf60b" - integrity sha512-WWi2GedccIJa0zXxx3WDnTgouGQTtdYK1nhXMwywbqqAgB0Ov+p1pYBsWh3VaB0bvBOwLse6OfVII7jZD9xo5Q== - dependencies: - "@typescript-eslint/utils" "^8.1.0" - debug "^4.3.4" - doctrine "^3.0.0" - eslint-import-resolver-node "^0.3.9" - get-tsconfig "^4.7.3" - is-glob "^4.0.3" - minimatch "^9.0.3" - semver "^7.6.3" - stable-hash "^0.0.4" - tslib "^2.6.3" - -eslint-scope@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.2.tgz#5cbb33d4384c9136083a71190d548158fe128f94" - integrity sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" - integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== - -eslint-visitor-keys@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb" - integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== - -eslint@^9.0.0: - version "9.10.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.10.0.tgz#0bd74d7fe4db77565d0e7f57c7df6d2b04756806" - integrity sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.11.0" - "@eslint/config-array" "^0.18.0" - "@eslint/eslintrc" "^3.1.0" - "@eslint/js" "9.10.0" - "@eslint/plugin-kit" "^0.1.0" - "@humanwhocodes/module-importer" "^1.0.1" - "@humanwhocodes/retry" "^0.3.0" - "@nodelib/fs.walk" "^1.2.8" - ajv "^6.12.4" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - escape-string-regexp "^4.0.0" - eslint-scope "^8.0.2" - eslint-visitor-keys "^4.0.0" - espree "^10.1.0" - esquery "^1.5.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^8.0.0" - find-up "^5.0.0" - glob-parent "^6.0.2" - ignore "^5.2.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - json-stable-stringify-without-jsonify "^1.0.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" - -espree@^10.0.1, espree@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56" - integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA== - dependencies: - acorn "^8.12.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^4.0.0" - -esquery@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7" - integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -event-target-shim@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" - integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== - -events@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -fast-decode-uri-component@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" - integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg== - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.3.0, fast-glob@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-json-stringify@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-6.0.0.tgz#15c5e85b567ead695773bf55938b56aaaa57d805" - integrity sha512-FGMKZwniMTgZh7zQp9b6XnBVxUmKVahQLQeRQHqwYmPDqDhcEKZ3BaQsxelFFI5PY7nN71OEeiL47/zUWcYe1A== - dependencies: - "@fastify/merge-json-schemas" "^0.1.1" - ajv "^8.12.0" - ajv-formats "^3.0.1" - fast-deep-equal "^3.1.3" - fast-uri "^2.3.0" - json-schema-ref-resolver "^1.0.1" - rfdc "^1.2.0" - -fast-levenshtein@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -fast-querystring@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53" - integrity sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg== - dependencies: - fast-decode-uri-component "^1.0.1" - -fast-redact@^3.1.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.3.0.tgz#7c83ce3a7be4898241a46560d51de10f653f7634" - integrity sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ== - -fast-uri@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.4.0.tgz#67eae6fbbe9f25339d5d3f4c4234787b65d7d55e" - integrity sha512-ypuAmmMKInk5q7XcepxlnUWDLWv4GFtaJqAzWKqn62IpQ3pejtr5dTVbt3vwqVaMKmkNR55sTT+CqUKIaT21BA== - -fast-uri@^3.0.0, fast-uri@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" - integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== - -fastify@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fastify/-/fastify-5.0.0.tgz#f8f80bd741bde2de1997c25dbe31e61c91978111" - integrity sha512-Qe4dU+zGOzg7vXjw4EvcuyIbNnMwTmcuOhlOrOJsgwzvjEZmsM/IeHulgJk+r46STjdJS/ZJbxO8N70ODXDMEQ== - dependencies: - "@fastify/ajv-compiler" "^4.0.0" - "@fastify/error" "^4.0.0" - "@fastify/fast-json-stringify-compiler" "^5.0.0" - abstract-logging "^2.0.1" - avvio "^9.0.0" - fast-json-stringify "^6.0.0" - find-my-way "^9.0.0" - light-my-request "^6.0.0" - pino "^9.0.0" - process-warning "^4.0.0" - proxy-addr "^2.0.7" - rfdc "^1.3.1" - secure-json-parse "^2.7.0" - semver "^7.6.0" - toad-cache "^3.7.0" - -fastq@^1.15.0, fastq@^1.17.1, fastq@^1.6.0: - version "1.17.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" - integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== - dependencies: - reusify "^1.0.4" - -fecha@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" - integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== - -fetch-blob@^3.1.2, fetch-blob@^3.1.4: - version "3.2.0" - resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9" - integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ== - dependencies: - node-domexception "^1.0.0" - web-streams-polyfill "^3.0.3" - -file-entry-cache@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f" - integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ== - dependencies: - flat-cache "^4.0.0" - -file-type@^18.0.0: - version "18.7.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-18.7.0.tgz#cddb16f184d6b94106cfc4bb56978726b25cb2a2" - integrity sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw== - dependencies: - readable-web-to-node-stream "^3.0.2" - strtok3 "^7.0.0" - token-types "^5.0.1" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -fill-range@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" - integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== - dependencies: - to-regex-range "^5.0.1" - -find-my-way@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/find-my-way/-/find-my-way-9.0.1.tgz#991c3a7af36734480d48cd4ad0889ed168ed6c40" - integrity sha512-/5NN/R0pFWuff16TMajeKt2JyiW+/OE8nOO8vo1DwZTxLaIURb7lcBYPIgRPh61yCNh9l8voeKwcrkUzmB00vw== - dependencies: - fast-deep-equal "^3.1.3" - fast-querystring "^1.0.0" - safe-regex2 "^4.0.0" - -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-up@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-7.0.0.tgz#e8dec1455f74f78d888ad65bf7ca13dd2b4e66fb" - integrity sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g== - dependencies: - locate-path "^7.2.0" - path-exists "^5.0.0" - unicorn-magic "^0.1.0" - -flat-cache@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c" - integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw== - dependencies: - flatted "^3.2.9" - keyv "^4.5.4" - -flatted@^3.2.9: - version "3.3.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" - integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== - -fn.name@1.x.x: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" - integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -formdata-polyfill@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" - integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== - dependencies: - fetch-blob "^3.1.2" - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -fsevents@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - -function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== - -gauge@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" - integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.2" - console-control-strings "^1.0.0" - has-unicode "^2.0.1" - object-assign "^4.1.1" - signal-exit "^3.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.2" - -get-port-please@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.2.tgz#502795e56217128e4183025c89a48c71652f4e49" - integrity sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ== - -get-tsconfig@^4.7.3: - version "4.8.1" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471" - integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg== - dependencies: - resolve-pkg-maps "^1.0.0" - -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob@^7.1.3: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e" - integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== - -globby@^13.1.2: - version "13.2.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592" - integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w== - dependencies: - dir-glob "^3.0.1" - fast-glob "^3.3.0" - ignore "^5.2.4" - merge2 "^1.4.1" - slash "^4.0.0" - -graceful-fs@^4.2.10: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - -graphemer@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" - integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== - -h3@^1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/h3/-/h3-1.12.0.tgz#9d7f05f08a997d263e484b02436cb027df3026d8" - integrity sha512-Zi/CcNeWBXDrFNlV0hUBJQR9F7a96RjMeAZweW/ZWkR9fuXrMcvKnSA63f/zZ9l0GgQOZDVHGvXivNN9PWOwhA== - dependencies: - cookie-es "^1.1.0" - crossws "^0.2.4" - defu "^6.1.4" - destr "^2.0.3" - iron-webcrypto "^1.1.1" - ohash "^1.1.3" - radix3 "^1.1.2" - ufo "^1.5.3" - uncrypto "^0.1.3" - unenv "^1.9.0" - -hard-rejection@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" - integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-unicode@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - -hasown@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" - integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== - dependencies: - function-bind "^1.1.2" - -hasown@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" - integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== - dependencies: - function-bind "^1.1.2" - -hosted-git-info@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -https-proxy-agent@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -ieee754@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore@^5.2.0, ignore@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" - integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== - -ignore@^5.2.4: - version "5.3.1" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" - integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== - -import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -indent-string@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5" - integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -iron-webcrypto@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz#aa60ff2aa10550630f4c0b11fd2442becdb35a6f" - integrity sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg== - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-core-module@^2.13.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" - integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== - dependencies: - hasown "^2.0.2" - -is-core-module@^2.5.0: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== - dependencies: - hasown "^2.0.0" - -is-docker@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" - integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-inside-container@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" - integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== - dependencies: - is-docker "^3.0.0" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-path-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-3.0.0.tgz#889b41e55c8588b1eb2a96a61d05740a674521c7" - integrity sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA== - -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-path-inside@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db" - integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA== - -is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-wsl@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" - integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== - dependencies: - is-inside-container "^1.0.0" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -js-md5@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2" - integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ== - -js-sha1@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/js-sha1/-/js-sha1-0.6.0.tgz#adbee10f0e8e18aa07cdea807cf08e9183dbc7f9" - integrity sha512-01gwBFreYydzmU9BmZxpVk6svJJHrVxEN3IOiGl6VO93bVKYETJ0sIth6DASI6mIFdt7NmfX9UiByRzsYHGU9w== - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-ref-resolver@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz#6586f483b76254784fc1d2120f717bdc9f0a99bf" - integrity sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw== - dependencies: - fast-deep-equal "^3.1.3" - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== - -keyv@^4.5.4: - version "4.5.4" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" - integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== - dependencies: - json-buffer "3.0.1" - -kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -kuler@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" - integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -light-my-request@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/light-my-request/-/light-my-request-6.0.0.tgz#97c6d0d5448ea2fc37836f0aefe94298f5a87dde" - integrity sha512-kFkFXrmKCL0EEeOmJybMH5amWFd+AFvlvMlvFTRxCUwbhfapZqDmeLMPoWihntnYY6JpoQDE9k+vOzObF1fDqg== - dependencies: - cookie "^0.6.0" - process-warning "^4.0.0" - set-cookie-parser "^2.6.0" - -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -load-tsconfig@^0.2.3: - version "0.2.5" - resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.5.tgz#453b8cd8961bfb912dea77eb6c168fe8cca3d3a1" - integrity sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg== - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -locate-path@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" - integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== - dependencies: - p-locate "^6.0.0" - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -logform@^2.6.0, logform@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0" - integrity sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA== - dependencies: - "@colors/colors" "1.6.0" - "@types/triple-beam" "^1.3.2" - fecha "^4.2.0" - ms "^2.1.1" - safe-stable-stringify "^2.3.1" - triple-beam "^1.3.0" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -map-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== - -map-obj@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" - integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== - -meow@^10.1.3: - version "10.1.5" - resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f" - integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw== - dependencies: - "@types/minimist" "^1.2.2" - camelcase-keys "^7.0.0" - decamelize "^5.0.0" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "4.1.0" - normalize-package-data "^3.0.2" - read-pkg-up "^8.0.0" - redent "^4.0.0" - trim-newlines "^4.0.2" - type-fest "^1.2.2" - yargs-parser "^20.2.9" - -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" - integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A== - -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - -min-indent@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" - integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== - -minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^9.0.3, minimatch@^9.0.4, minimatch@^9.0.5: - version "9.0.5" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" - integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== - dependencies: - brace-expansion "^2.0.1" - -minimist-options@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" - integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - kind-of "^6.0.3" - -minipass@^3.0.0: - version "3.3.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" - integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== - dependencies: - yallist "^4.0.0" - -minipass@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" - integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mlly@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.1.tgz#e0336429bb0731b6a8e887b438cbdae522c8f32f" - integrity sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA== - dependencies: - acorn "^8.11.3" - pathe "^1.1.2" - pkg-types "^1.1.1" - ufo "^1.5.3" - -mrmime@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4" - integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.1.1, ms@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -nan@^2.17.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" - integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -node-domexception@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" - integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== - -node-fetch-native@^1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.6.4.tgz#679fc8fd8111266d47d7e72c379f1bed9acff06e" - integrity sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ== - -node-fetch@^2.6.7: - version "2.7.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - -node-fetch@^3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b" - integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA== - dependencies: - data-uri-to-buffer "^4.0.0" - fetch-blob "^3.1.4" - formdata-polyfill "^4.0.10" - -node-worker-threads-pool@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/node-worker-threads-pool/-/node-worker-threads-pool-1.5.1.tgz#1034303e10bb63a541ec74ae26559e9dff355f27" - integrity sha512-7TXAhpMm+jO4MfESxYLtMGSnJWv+itdNHMdaFmeZuPXxwFGU90mtEB42BciUULXOUAxYBfXILAuvrSG3rQZ7mw== - -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -normalize-package-data@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" - integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== - dependencies: - hosted-git-info "^4.0.1" - is-core-module "^2.5.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npmlog@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" - integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== - dependencies: - are-we-there-yet "^2.0.0" - console-control-strings "^1.1.0" - gauge "^3.0.0" - set-blocking "^2.0.0" - -object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -ohash@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.4.tgz#ae8d83014ab81157d2c285abf7792e2995fadd72" - integrity sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g== - -on-exit-leak-free@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8" - integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA== - -once@^1.3.0, once@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -one-time@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" - integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== - dependencies: - fn.name "1.x.x" - -open@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1" - integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw== - dependencies: - default-browser "^5.2.1" - define-lazy-prop "^3.0.0" - is-inside-container "^1.0.0" - is-wsl "^3.1.0" - -optionator@^0.9.3: - version "0.9.4" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" - integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.5" - -opusscript@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/opusscript/-/opusscript-0.0.8.tgz#00b49e81281b4d99092d013b1812af8654bd0a87" - integrity sha512-VSTi1aWFuCkRCVq+tx/BQ5q9fMnQ9pVZ3JU4UHKqTkf0ED3fKEPdr+gKAAl3IA2hj9rrP6iyq3hlcJq3HELtNQ== - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-limit@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" - integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== - dependencies: - yocto-queue "^1.0.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-locate@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" - integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== - dependencies: - p-limit "^4.0.0" - -p-map@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715" - integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg== - dependencies: - aggregate-error "^4.0.0" - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parsimmon@^1.16.0: - version "1.18.1" - resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.18.1.tgz#d8dd9c28745647d02fc6566f217690897eed7709" - integrity sha512-u7p959wLfGAhJpSDJVYXoyMCXWYwHia78HhRBWqk7AIbxdmlrfdp5wX0l3xv/iTSH5HvhN9K7o26hwwpgS5Nmw== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-exists@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" - integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pathe@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec" - integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ== - -pb-text-format-to-json@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/pb-text-format-to-json/-/pb-text-format-to-json-1.1.2.tgz#a542ea03c209ad1c3ccbe77d3dc5e7589299d63f" - integrity sha512-byfRFK5zx9d6kMRBGTyxG9j/POUVjs9bO2/mhiBauj5xKuANaWTaqBFbi1wihkSjcBYEANwmtLq6RxTocBUFuQ== - dependencies: - parsimmon "^1.16.0" - -peek-readable@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.0.0.tgz#7ead2aff25dc40458c60347ea76cfdfd63efdfec" - integrity sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A== - -picocolors@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" - integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -picomatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" - integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== - -pino-abstract-transport@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz#97f9f2631931e242da531b5c66d3079c12c9d1b5" - integrity sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q== - dependencies: - readable-stream "^4.0.0" - split2 "^4.0.0" - -pino-std-serializers@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz#7c625038b13718dbbd84ab446bd673dc52259e3b" - integrity sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA== - -pino@^9.0.0: - version "9.4.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-9.4.0.tgz#e4600ff199efc744856a5b3b71c53e38998eae5a" - integrity sha512-nbkQb5+9YPhQRz/BeQmrWpEknAaqjpAqRK8NwJpmrX/JHu7JuZC5G1CeAwJDJfGes4h+YihC6in3Q2nGb+Y09w== - dependencies: - atomic-sleep "^1.0.0" - fast-redact "^3.1.1" - on-exit-leak-free "^2.1.0" - pino-abstract-transport "^1.2.0" - pino-std-serializers "^7.0.0" - process-warning "^4.0.0" - quick-format-unescaped "^4.0.3" - real-require "^0.2.0" - safe-stable-stringify "^2.3.1" - sonic-boom "^4.0.1" - thread-stream "^3.0.0" - -pkg-types@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.2.0.tgz#d0268e894e93acff11a6279de147e83354ebd42d" - integrity sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA== - dependencies: - confbox "^0.1.7" - mlly "^1.7.1" - pathe "^1.1.2" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prisma@^5.10.2: - version "5.10.2" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.10.2.tgz#aa63085c49dc74cdb5c3816e8dd1fb4d74a2aadd" - integrity sha512-hqb/JMz9/kymRE25pMWCxkdyhbnIWrq+h7S6WysJpdnCvhstbJSNP/S6mScEcqiB8Qv2F+0R3yG+osRaWqZacQ== - dependencies: - "@prisma/engines" "5.10.2" - -process-warning@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-4.0.0.tgz#581e3a7a1fb456c5f4fd239f76bce75897682d5a" - integrity sha512-/MyYDxttz7DfGMMHiysAsFE4qF+pQYAA8ziO/3NcRVrQ5fSk+Mns4QZA/oRPFzvcqNoVJXQNWNAsdwBXLUkQKw== - -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== - -proxy-addr@^2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -punycode@^2.1.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" - integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -quick-format-unescaped@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7" - integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg== - -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - -radix3@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/radix3/-/radix3-1.1.2.tgz#fd27d2af3896c6bf4bcdfab6427c69c2afc69ec0" - integrity sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA== - -read-pkg-up@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670" - integrity sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ== - dependencies: - find-up "^5.0.0" - read-pkg "^6.0.0" - type-fest "^1.0.1" - -read-pkg@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c" - integrity sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q== - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^3.0.2" - parse-json "^5.2.0" - type-fest "^1.0.1" - -readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" - integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09" - integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g== - dependencies: - abort-controller "^3.0.0" - buffer "^6.0.3" - events "^3.3.0" - process "^0.11.10" - string_decoder "^1.3.0" - -readable-web-to-node-stream@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" - integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw== - dependencies: - readable-stream "^3.6.0" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -real-require@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78" - integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg== - -redent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9" - integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag== - dependencies: - indent-string "^5.0.0" - strip-indent "^4.0.0" - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-pkg-maps@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" - integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== - -resolve@^1.22.4: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== - dependencies: - is-core-module "^2.13.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -ret@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.5.0.tgz#30a4d38a7e704bd96dc5ffcbe7ce2a9274c41c95" - integrity sha512-I1XxrZSQ+oErkRR4jYbAyEEu2I0avBvvMM5JN+6EBprOGRCs63ENqZ3vjavq8fBw2+62G5LF5XelKwuJpcvcxw== - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rfdc@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" - integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== - -rfdc@^1.3.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca" - integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA== - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -run-applescript@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb" - integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A== - -run-parallel@^1.1.9, run-parallel@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-regex2@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/safe-regex2/-/safe-regex2-4.0.0.tgz#5e04d8362cd4884753c8bce9715d4759a5239c0a" - integrity sha512-Hvjfv25jPDVr3U+4LDzBuZPPOymELG3PYcSk5hcevooo1yxxamQL/bHs/GrEPGmMoMEwRrHVGiCA1pXi97B8Ew== - dependencies: - ret "~0.5.0" - -safe-stable-stringify@^2.3.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd" - integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA== - -secure-json-parse@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862" - integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== - -semver@^6.0.0: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^7.3.4, semver@^7.3.5: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -semver@^7.6.0, semver@^7.6.3: - version "7.6.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" - integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - -set-cookie-parser@^2.6.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.0.tgz#ef5552b56dc01baae102acb5fc9fb8cd060c30f9" - integrity sha512-lXLOiqpkUumhRdFF3k1osNXCy9akgx/dyPZ5p8qAg9seJzXr5ZrlqZuWIMuY6ejOsVLE6flJ5/h3lsn57fQ/PQ== - -sharp@^0.33.4: - version "0.33.5" - resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.5.tgz#13e0e4130cc309d6a9497596715240b2ec0c594e" - integrity sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw== - dependencies: - color "^4.2.3" - detect-libc "^2.0.3" - semver "^7.6.3" - optionalDependencies: - "@img/sharp-darwin-arm64" "0.33.5" - "@img/sharp-darwin-x64" "0.33.5" - "@img/sharp-libvips-darwin-arm64" "1.0.4" - "@img/sharp-libvips-darwin-x64" "1.0.4" - "@img/sharp-libvips-linux-arm" "1.0.5" - "@img/sharp-libvips-linux-arm64" "1.0.4" - "@img/sharp-libvips-linux-s390x" "1.0.4" - "@img/sharp-libvips-linux-x64" "1.0.4" - "@img/sharp-libvips-linuxmusl-arm64" "1.0.4" - "@img/sharp-libvips-linuxmusl-x64" "1.0.4" - "@img/sharp-linux-arm" "0.33.5" - "@img/sharp-linux-arm64" "0.33.5" - "@img/sharp-linux-s390x" "0.33.5" - "@img/sharp-linux-x64" "0.33.5" - "@img/sharp-linuxmusl-arm64" "0.33.5" - "@img/sharp-linuxmusl-x64" "0.33.5" - "@img/sharp-wasm32" "0.33.5" - "@img/sharp-win32-ia32" "0.33.5" - "@img/sharp-win32-x64" "0.33.5" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -signal-exit@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55" - integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== - dependencies: - is-arrayish "^0.3.1" - -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== - -sonic-boom@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-4.1.0.tgz#4f039663ba191fac5cfe4f1dc330faac079e4342" - integrity sha512-NGipjjRicyJJ03rPiZCJYjwlsuP2d1/5QUviozRXC7S3WdVWNK5e3Ojieb9CCyfhq2UC+3+SRd9nG3I2lPRvUw== - dependencies: - atomic-sleep "^1.0.0" - -spdx-correct@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" - integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz#c07a4ede25b16e4f78e6707bbd84b15a45c19c1b" - integrity sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.16" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" - integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== - -split2@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" - integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== - -stable-hash@^0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.4.tgz#55ae7dadc13e4b3faed13601587cec41859b42f7" - integrity sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g== - -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string_decoder@^1.1.1, string_decoder@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853" - integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA== - dependencies: - min-indent "^1.0.1" - -strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strtok3@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.0.0.tgz#868c428b4ade64a8fd8fee7364256001c1a4cbe5" - integrity sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ== - dependencies: - "@tokenizer/token" "^0.3.0" - peek-readable "^5.0.0" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -tar@^6.1.11: - version "6.2.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -text-hex@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" - integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - -thread-stream@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-3.1.0.tgz#4b2ef252a7c215064507d4ef70c05a5e2d34c4f1" - integrity sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A== - dependencies: - real-require "^0.2.0" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toad-cache@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/toad-cache/-/toad-cache-3.7.0.tgz#b9b63304ea7c45ec34d91f1d2fa513517025c441" - integrity sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw== - -token-types@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/token-types/-/token-types-5.0.1.tgz#aa9d9e6b23c420a675e55413b180635b86a093b4" - integrity sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg== - dependencies: - "@tokenizer/token" "^0.3.0" - ieee754 "^1.2.1" - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - -trim-newlines@^4.0.2: - version "4.1.1" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125" - integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ== - -triple-beam@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" - integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== - -ts-api-utils@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" - integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== - -tslib@^2.4.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== - -tslib@^2.6.3: - version "2.7.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" - integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== - -tweetnacl@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" - integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" - integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== - -typescript-eslint@^8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.6.0.tgz#5f0b5e23b34385ef146e447616c1a0d6bd14bedb" - integrity sha512-eEhhlxCEpCd4helh3AO1hk0UP2MvbRi9CtIAJTVPQjuSXOOO2jsEacNi4UdcJzZJbeuVg1gMhtZ8UYb+NFYPrA== - dependencies: - "@typescript-eslint/eslint-plugin" "8.6.0" - "@typescript-eslint/parser" "8.6.0" - "@typescript-eslint/utils" "8.6.0" - -typescript@^5.6.2: - version "5.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0" - integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw== - -ufo@^1.5.3: - version "1.5.4" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754" - integrity sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ== - -uncrypto@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b" - integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q== - -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== - -unenv@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/unenv/-/unenv-1.10.0.tgz#c3394a6c6e4cfe68d699f87af456fe3f0db39571" - integrity sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ== - dependencies: - consola "^3.2.3" - defu "^6.1.4" - mime "^3.0.0" - node-fetch-native "^1.6.4" - pathe "^1.1.2" - -unicorn-magic@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4" - integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ== - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -util-deprecate@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -uuid-by-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/uuid-by-string/-/uuid-by-string-4.0.0.tgz#1d6da2154294368ae85d3853e4c895cfa52c1179" - integrity sha512-88ZSfcSkN04juiLqSsuyteqlSrXNFdsEPzSv3urnElDXNsZUXQN0smeTnh99x2DE15SCUQNgqKBfro54CuzHNQ== - dependencies: - js-md5 "^0.7.3" - js-sha1 "^0.6.0" - -uuid@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" - integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -web-streams-polyfill@^3.0.3: - version "3.3.2" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz#32e26522e05128203a7de59519be3c648004343b" - integrity sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ== - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - -winston-transport@^4.7.0: - version "4.7.1" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.1.tgz#52ff1bcfe452ad89991a0aaff9c3b18e7f392569" - integrity sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA== - dependencies: - logform "^2.6.1" - readable-stream "^3.6.2" - triple-beam "^1.3.0" - -winston@^3.11.0: - version "3.14.2" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.14.2.tgz#94ce5fd26d374f563c969d12f0cd9c641065adab" - integrity sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg== - dependencies: - "@colors/colors" "^1.6.0" - "@dabh/diagnostics" "^2.0.2" - async "^3.2.3" - is-stream "^2.0.0" - logform "^2.6.0" - one-time "^1.0.0" - readable-stream "^3.4.0" - safe-stable-stringify "^2.3.1" - stack-trace "0.0.x" - triple-beam "^1.3.0" - winston-transport "^4.7.0" - -word-wrap@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" - integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -ws@^8.18.0: - version "8.18.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" - integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== - -ws@^8.2.3: - version "8.16.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@^20.2.9: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - -yocto-queue@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110" - integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g== +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! + +__metadata: + version: 8 + cacheKey: 10c0 + +"@babel/code-frame@npm:^7.0.0": + version: 7.24.7 + resolution: "@babel/code-frame@npm:7.24.7" + dependencies: + "@babel/highlight": "npm:^7.24.7" + picocolors: "npm:^1.0.0" + checksum: 10c0/ab0af539473a9f5aeaac7047e377cb4f4edd255a81d84a76058595f8540784cc3fbe8acf73f1e073981104562490aabfb23008cd66dc677a456a4ed5390fdde6 + languageName: node + linkType: hard + +"@babel/helper-validator-identifier@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/helper-validator-identifier@npm:7.24.7" + checksum: 10c0/87ad608694c9477814093ed5b5c080c2e06d44cb1924ae8320474a74415241223cc2a725eea2640dd783ff1e3390e5f95eede978bc540e870053152e58f1d651 + languageName: node + linkType: hard + +"@babel/highlight@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/highlight@npm:7.24.7" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.24.7" + chalk: "npm:^2.4.2" + js-tokens: "npm:^4.0.0" + picocolors: "npm:^1.0.0" + checksum: 10c0/674334c571d2bb9d1c89bdd87566383f59231e16bcdcf5bb7835babdf03c9ae585ca0887a7b25bdf78f303984af028df52831c7989fecebb5101cc132da9393a + languageName: node + linkType: hard + +"@colors/colors@npm:1.6.0, @colors/colors@npm:^1.6.0": + version: 1.6.0 + resolution: "@colors/colors@npm:1.6.0" + checksum: 10c0/9328a0778a5b0db243af54455b79a69e3fb21122d6c15ef9e9fcc94881d8d17352d8b2b2590f9bdd46fac5c2d6c1636dcfc14358a20c70e22daf89e1a759b629 + languageName: node + linkType: hard + +"@dabh/diagnostics@npm:^2.0.2": + version: 2.0.3 + resolution: "@dabh/diagnostics@npm:2.0.3" + dependencies: + colorspace: "npm:1.1.x" + enabled: "npm:2.0.x" + kuler: "npm:^2.0.0" + checksum: 10c0/a5133df8492802465ed01f2f0a5784585241a1030c362d54a602ed1839816d6c93d71dde05cf2ddb4fd0796238c19774406bd62fa2564b637907b495f52425fe + languageName: node + linkType: hard + +"@emnapi/runtime@npm:^1.2.0": + version: 1.2.0 + resolution: "@emnapi/runtime@npm:1.2.0" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10c0/7005ff8b67724c9e61b6cd79a3decbdb2ce25d24abd4d3d187472f200ee6e573329c30264335125fb136bd813aa9cf9f4f7c9391d04b07dd1e63ce0a3427be57 + languageName: node + linkType: hard + +"@esbuild/aix-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/aix-ppc64@npm:0.21.5" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + +"@esbuild/android-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm64@npm:0.21.5" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/android-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm@npm:0.21.5" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@esbuild/android-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-x64@npm:0.21.5" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/darwin-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-arm64@npm:0.21.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/darwin-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-x64@npm:0.21.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/freebsd-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-arm64@npm:0.21.5" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/freebsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-x64@npm:0.21.5" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/linux-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm64@npm:0.21.5" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/linux-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm@npm:0.21.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@esbuild/linux-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ia32@npm:0.21.5" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/linux-loong64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-loong64@npm:0.21.5" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + +"@esbuild/linux-mips64el@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-mips64el@npm:0.21.5" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + +"@esbuild/linux-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ppc64@npm:0.21.5" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + +"@esbuild/linux-riscv64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-riscv64@npm:0.21.5" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + +"@esbuild/linux-s390x@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-s390x@npm:0.21.5" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + +"@esbuild/linux-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-x64@npm:0.21.5" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/netbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/netbsd-x64@npm:0.21.5" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/openbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/openbsd-x64@npm:0.21.5" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/sunos-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/sunos-x64@npm:0.21.5" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/win32-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-arm64@npm:0.21.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/win32-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-ia32@npm:0.21.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/win32-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-x64@npm:0.21.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": + version: 4.4.0 + resolution: "@eslint-community/eslint-utils@npm:4.4.0" + dependencies: + eslint-visitor-keys: "npm:^3.3.0" + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e + languageName: node + linkType: hard + +"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.11.0": + version: 4.11.1 + resolution: "@eslint-community/regexpp@npm:4.11.1" + checksum: 10c0/fbcc1cb65ef5ed5b92faa8dc542e035269065e7ebcc0b39c81a4fe98ad35cfff20b3c8df048641de15a7757e07d69f85e2579c1a5055f993413ba18c055654f8 + languageName: node + linkType: hard + +"@eslint/config-array@npm:^0.17.1": + version: 0.17.1 + resolution: "@eslint/config-array@npm:0.17.1" + dependencies: + "@eslint/object-schema": "npm:^2.1.4" + debug: "npm:^4.3.1" + minimatch: "npm:^3.1.2" + checksum: 10c0/b986a0a96f2b42467578968ce3d4ae3b9284e587f8490f2dcdc44ff1b8d30580c62b221da6e58d07b09e156c3050e2dc38267f9370521d9cafc099c4e30154ef + languageName: node + linkType: hard + +"@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: 10c0/0234aeb3e6b052ad2402a647d0b4f8a6aa71524bafe1adad0b8db1dfe94d7f5f26d67c80f79bb37ac61361a1d4b14bb8fb475efe501de37263cf55eabb79868f + languageName: node + linkType: hard + +"@eslint/config-inspector@npm:^0.5.4": + version: 0.5.4 + resolution: "@eslint/config-inspector@npm:0.5.4" + dependencies: + "@eslint/config-array": "npm:^0.17.1" + "@voxpelli/config-array-find-files": "npm:^0.1.2" + bundle-require: "npm:^5.0.0" + cac: "npm:^6.7.14" + chokidar: "npm:^3.6.0" + esbuild: "npm:^0.21.5" + fast-glob: "npm:^3.3.2" + find-up: "npm:^7.0.0" + get-port-please: "npm:^3.1.2" + h3: "npm:^1.12.0" + minimatch: "npm:^9.0.5" + mlly: "npm:^1.7.1" + mrmime: "npm:^2.0.0" + open: "npm:^10.1.0" + picocolors: "npm:^1.0.1" + ws: "npm:^8.18.0" + peerDependencies: + eslint: ^8.50.0 || ^9.0.0 + bin: + config-inspector: bin.mjs + eslint-config-inspector: bin.mjs + checksum: 10c0/d75da63243e6399c6b650886c6af33b61faa098d93bd30bc8349011bef1fbbbe1b780fffd57d1dd34f82590999a58a8413c495b7e9067bf8e1387447b6d7679b + languageName: node + linkType: hard + +"@eslint/core@npm:^0.6.0": + version: 0.6.0 + resolution: "@eslint/core@npm:0.6.0" + checksum: 10c0/fffdb3046ad6420f8cb9204b6466fdd8632a9baeebdaf2a97d458a4eac0e16653ba50d82d61835d7d771f6ced0ec942ec482b2fbccc300e45f2cbf784537f240 + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^3.1.0": + version: 3.1.0 + resolution: "@eslint/eslintrc@npm:3.1.0" + dependencies: + ajv: "npm:^6.12.4" + debug: "npm:^4.3.2" + 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: 10c0/5b7332ed781edcfc98caa8dedbbb843abfb9bda2e86538529c843473f580e40c69eb894410eddc6702f487e9ee8f8cfa8df83213d43a8fdb549f23ce06699167 + languageName: node + linkType: hard + +"@eslint/js@npm:9.11.1": + version: 9.11.1 + resolution: "@eslint/js@npm:9.11.1" + checksum: 10c0/22916ef7b09c6f60c62635d897c66e1e3e38d90b5a5cf5e62769033472ecbcfb6ec7c886090a4b32fe65d6ce371da54384e46c26a899e38184dfc152c6152f7b + languageName: node + linkType: hard + +"@eslint/object-schema@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/object-schema@npm:2.1.4" + checksum: 10c0/e9885532ea70e483fb007bf1275968b05bb15ebaa506d98560c41a41220d33d342e19023d5f2939fed6eb59676c1bda5c847c284b4b55fce521d282004da4dda + languageName: node + linkType: hard + +"@eslint/plugin-kit@npm:^0.2.0": + version: 0.2.0 + resolution: "@eslint/plugin-kit@npm:0.2.0" + dependencies: + levn: "npm:^0.4.1" + checksum: 10c0/00b92bc52ad09b0e2bbbb30591c02a895f0bec3376759562590e8a57a13d096b22f8c8773b6bf791a7cf2ea614123b3d592fd006c51ac5fd0edbb90ea6d8760c + languageName: node + linkType: hard + +"@fastify/ajv-compiler@npm:^4.0.0": + version: 4.0.1 + resolution: "@fastify/ajv-compiler@npm:4.0.1" + dependencies: + ajv: "npm:^8.12.0" + ajv-formats: "npm:^3.0.1" + fast-uri: "npm:^3.0.0" + checksum: 10c0/178d06e799e6ea19d4b579cc90e11ef50babda9fc2828d85edbd7b08aaa5a63dad2a42ba92e07e9c1e5da78e4382854bb1e99a6f2f5e61da67c670dc3572842e + languageName: node + linkType: hard + +"@fastify/error@npm:^4.0.0": + version: 4.0.0 + resolution: "@fastify/error@npm:4.0.0" + checksum: 10c0/074b8a6c350c29a8fc8314298d9457fe0c1ba6e7f160e9ae6ba0e18853f1ec7427d768f966700cbf67a4694f3a9a593c6a23e42ce3ed62e40fecdf8026040d9a + languageName: node + linkType: hard + +"@fastify/fast-json-stringify-compiler@npm:^5.0.0": + version: 5.0.1 + resolution: "@fastify/fast-json-stringify-compiler@npm:5.0.1" + dependencies: + fast-json-stringify: "npm:^6.0.0" + checksum: 10c0/dc294c24684fe900b9190f3b4d8e52b6438bf9e737dbd2b3b202d906f71ef1fb406c031c40fc34f52c61f4f00e1a0d5753ce5a88064de371248fb4116c02066b + languageName: node + linkType: hard + +"@fastify/merge-json-schemas@npm:^0.1.1": + version: 0.1.1 + resolution: "@fastify/merge-json-schemas@npm:0.1.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + checksum: 10c0/7979ce12724f7b98aea06f0bb9afb20dd869f0ff6fc697517135cbb54e0a36b062cbb38ec176fe43d1fc455576839240df8f33533939ace2d64a6218a6e6b9c1 + languageName: node + linkType: hard + +"@humanwhocodes/module-importer@npm:^1.0.1": + version: 1.0.1 + resolution: "@humanwhocodes/module-importer@npm:1.0.1" + checksum: 10c0/909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529 + languageName: node + linkType: hard + +"@humanwhocodes/retry@npm:^0.3.0": + version: 0.3.0 + resolution: "@humanwhocodes/retry@npm:0.3.0" + checksum: 10c0/7111ec4e098b1a428459b4e3be5a5d2a13b02905f805a2468f4fa628d072f0de2da26a27d04f65ea2846f73ba51f4204661709f05bfccff645e3cedef8781bb6 + languageName: node + linkType: hard + +"@img/sharp-darwin-arm64@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-darwin-arm64@npm:0.33.5" + dependencies: + "@img/sharp-libvips-darwin-arm64": "npm:1.0.4" + dependenciesMeta: + "@img/sharp-libvips-darwin-arm64": + optional: true + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@img/sharp-darwin-x64@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-darwin-x64@npm:0.33.5" + dependencies: + "@img/sharp-libvips-darwin-x64": "npm:1.0.4" + dependenciesMeta: + "@img/sharp-libvips-darwin-x64": + optional: true + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@img/sharp-libvips-darwin-arm64@npm:1.0.4": + version: 1.0.4 + resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.4" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@img/sharp-libvips-darwin-x64@npm:1.0.4": + version: 1.0.4 + resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.4" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-arm64@npm:1.0.4": + version: 1.0.4 + resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.4" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-arm@npm:1.0.5": + version: 1.0.5 + resolution: "@img/sharp-libvips-linux-arm@npm:1.0.5" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-s390x@npm:1.0.4": + version: 1.0.4 + resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.4" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-x64@npm:1.0.4": + version: 1.0.4 + resolution: "@img/sharp-libvips-linux-x64@npm:1.0.4" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4": + version: 1.0.4 + resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-libvips-linuxmusl-x64@npm:1.0.4": + version: 1.0.4 + resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.4" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-linux-arm64@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-linux-arm64@npm:0.33.5" + dependencies: + "@img/sharp-libvips-linux-arm64": "npm:1.0.4" + dependenciesMeta: + "@img/sharp-libvips-linux-arm64": + optional: true + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linux-arm@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-linux-arm@npm:0.33.5" + dependencies: + "@img/sharp-libvips-linux-arm": "npm:1.0.5" + dependenciesMeta: + "@img/sharp-libvips-linux-arm": + optional: true + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linux-s390x@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-linux-s390x@npm:0.33.5" + dependencies: + "@img/sharp-libvips-linux-s390x": "npm:1.0.4" + dependenciesMeta: + "@img/sharp-libvips-linux-s390x": + optional: true + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linux-x64@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-linux-x64@npm:0.33.5" + dependencies: + "@img/sharp-libvips-linux-x64": "npm:1.0.4" + dependenciesMeta: + "@img/sharp-libvips-linux-x64": + optional: true + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linuxmusl-arm64@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.5" + dependencies: + "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4" + dependenciesMeta: + "@img/sharp-libvips-linuxmusl-arm64": + optional: true + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-linuxmusl-x64@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-linuxmusl-x64@npm:0.33.5" + dependencies: + "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4" + dependenciesMeta: + "@img/sharp-libvips-linuxmusl-x64": + optional: true + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-wasm32@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-wasm32@npm:0.33.5" + dependencies: + "@emnapi/runtime": "npm:^1.2.0" + conditions: cpu=wasm32 + languageName: node + linkType: hard + +"@img/sharp-win32-ia32@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-win32-ia32@npm:0.33.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@img/sharp-win32-x64@npm:0.33.5": + version: 0.33.5 + resolution: "@img/sharp-win32-x64@npm:0.33.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@isaacs/cliui@npm:^8.0.2": + version: 8.0.2 + resolution: "@isaacs/cliui@npm:8.0.2" + dependencies: + string-width: "npm:^5.1.2" + string-width-cjs: "npm:string-width@^4.2.0" + strip-ansi: "npm:^7.0.1" + strip-ansi-cjs: "npm:strip-ansi@^6.0.1" + wrap-ansi: "npm:^8.1.0" + wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" + checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e + languageName: node + linkType: hard + +"@mapbox/node-pre-gyp@npm:^1.0.0": + version: 1.0.11 + resolution: "@mapbox/node-pre-gyp@npm:1.0.11" + dependencies: + detect-libc: "npm:^2.0.0" + https-proxy-agent: "npm:^5.0.0" + make-dir: "npm:^3.1.0" + node-fetch: "npm:^2.6.7" + nopt: "npm:^5.0.0" + npmlog: "npm:^5.0.1" + rimraf: "npm:^3.0.2" + semver: "npm:^7.3.5" + tar: "npm:^6.1.11" + bin: + node-pre-gyp: bin/node-pre-gyp + checksum: 10c0/2b24b93c31beca1c91336fa3b3769fda98e202fb7f9771f0f4062588d36dcc30fcf8118c36aa747fa7f7610d8cf601872bdaaf62ce7822bb08b545d1bbe086cc + languageName: node + linkType: hard + +"@nodelib/fs.scandir@npm:2.1.5": + version: 2.1.5 + resolution: "@nodelib/fs.scandir@npm:2.1.5" + dependencies: + "@nodelib/fs.stat": "npm:2.0.5" + run-parallel: "npm:^1.1.9" + checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb + languageName: node + linkType: hard + +"@nodelib/fs.scandir@npm:3.0.0": + version: 3.0.0 + resolution: "@nodelib/fs.scandir@npm:3.0.0" + dependencies: + "@nodelib/fs.stat": "npm:3.0.0" + run-parallel: "npm:^1.2.0" + checksum: 10c0/ff557a1d4dc779e41dd1108f92690a03bc3f0debd26a2c4d890fa3fe606646c2e6d958a9ccb3e59f2fd4751eed405151b7f1ab18947b5909ad67b64e155bc760 + languageName: node + linkType: hard + +"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2": + version: 2.0.5 + resolution: "@nodelib/fs.stat@npm:2.0.5" + checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d + languageName: node + linkType: hard + +"@nodelib/fs.stat@npm:3.0.0": + version: 3.0.0 + resolution: "@nodelib/fs.stat@npm:3.0.0" + checksum: 10c0/c798b6b07a3d93e29a98699dbda3380d28fe05194b2396b2d02670249691fe2758e0a7a32f1f760dabcbde05f3e0b2822c4b94e40c6c27b2db914c806e162687 + languageName: node + linkType: hard + +"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": + version: 1.2.8 + resolution: "@nodelib/fs.walk@npm:1.2.8" + dependencies: + "@nodelib/fs.scandir": "npm:2.1.5" + fastq: "npm:^1.6.0" + checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1 + languageName: node + linkType: hard + +"@nodelib/fs.walk@npm:^2.0.0": + version: 2.0.0 + resolution: "@nodelib/fs.walk@npm:2.0.0" + dependencies: + "@nodelib/fs.scandir": "npm:3.0.0" + fastq: "npm:^1.15.0" + checksum: 10c0/e490143c4596c89797f7c375104aeb0409a68492cd92c9344fcf2408a5a876580b56282b3d960d7f7d1346a41fd29cbb588707ac8dcc0b8d048ab38e1d2709cf + languageName: node + linkType: hard + +"@npmcli/agent@npm:^2.0.0": + version: 2.2.2 + resolution: "@npmcli/agent@npm:2.2.2" + dependencies: + agent-base: "npm:^7.1.0" + http-proxy-agent: "npm:^7.0.0" + https-proxy-agent: "npm:^7.0.1" + lru-cache: "npm:^10.0.1" + socks-proxy-agent: "npm:^8.0.3" + checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae + languageName: node + linkType: hard + +"@npmcli/fs@npm:^3.1.0": + version: 3.1.1 + resolution: "@npmcli/fs@npm:3.1.1" + dependencies: + semver: "npm:^7.3.5" + checksum: 10c0/c37a5b4842bfdece3d14dfdb054f73fe15ed2d3da61b34ff76629fb5b1731647c49166fd2a8bf8b56fcfa51200382385ea8909a3cbecdad612310c114d3f6c99 + languageName: node + linkType: hard + +"@pkgjs/parseargs@npm:^0.11.0": + version: 0.11.0 + resolution: "@pkgjs/parseargs@npm:0.11.0" + checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd + languageName: node + linkType: hard + +"@prisma/client@npm:5.20.0": + version: 5.20.0 + resolution: "@prisma/client@npm:5.20.0" + peerDependencies: + prisma: "*" + peerDependenciesMeta: + prisma: + optional: true + checksum: 10c0/e7480e49830c1bd2292ea92de979cce4502f886c7e9ac43efb639771bb8fe6150e8688e6ff11de77af999536ad6bf7db1595649352a8527e81b951ad6c43f57f + languageName: node + linkType: hard + +"@prisma/debug@npm:5.20.0": + version: 5.20.0 + resolution: "@prisma/debug@npm:5.20.0" + checksum: 10c0/820e3e2c25f1a046024383a3a83f28707a99af1e04f46016c78d6b6231a901353755202578ce27760e00a654b357b634a3e79b99bfe710ba6d6a7f480fcdf6b9 + languageName: node + linkType: hard + +"@prisma/engines-version@npm:5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284": + version: 5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284 + resolution: "@prisma/engines-version@npm:5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284" + checksum: 10c0/1dbe962b5b55015e7f4483e5644bdaec9bf348676d72496f56a6ba365c41d4404a311ed2dd144099146048ccfa45b2752fd9e09765282404d266c4d34179d904 + languageName: node + linkType: hard + +"@prisma/engines@npm:5.20.0": + version: 5.20.0 + resolution: "@prisma/engines@npm:5.20.0" + dependencies: + "@prisma/debug": "npm:5.20.0" + "@prisma/engines-version": "npm:5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284" + "@prisma/fetch-engine": "npm:5.20.0" + "@prisma/get-platform": "npm:5.20.0" + checksum: 10c0/1197d2796f4daef24bc8cf6c5e85ac360e3a1ab6cd0b0a4751650fd728a53f6c66681c39fab9b68b0f78f95586bef174f383dda9e0bca08274d2c1cdcd3b1f9f + languageName: node + linkType: hard + +"@prisma/fetch-engine@npm:5.20.0": + version: 5.20.0 + resolution: "@prisma/fetch-engine@npm:5.20.0" + dependencies: + "@prisma/debug": "npm:5.20.0" + "@prisma/engines-version": "npm:5.20.0-12.06fc58a368dc7be9fbbbe894adf8d445d208c284" + "@prisma/get-platform": "npm:5.20.0" + checksum: 10c0/854f4fce34b734e5046e4a5e660f2b689a40231f3dfe7c77f805c4011afab1c58570e4d45f915aa69b8889c06ea64ecb763d6f71ba8cc50b26c4365e762dbd63 + languageName: node + linkType: hard + +"@prisma/get-platform@npm:5.20.0": + version: 5.20.0 + resolution: "@prisma/get-platform@npm:5.20.0" + dependencies: + "@prisma/debug": "npm:5.20.0" + checksum: 10c0/2a12bf0ffee6842907dd3ea40ce44430ccfcd1135e636a151e9cdbaa91a5bf62eb5f9913066d6caea2f7c87be9fd660d80258a7f775f141d20ddf8067ca651c2 + languageName: node + linkType: hard + +"@sinclair/typebox@npm:^0.33.12": + version: 0.33.12 + resolution: "@sinclair/typebox@npm:0.33.12" + checksum: 10c0/0ddff4c7e15795d552888fa32491b6d42190ad9d38cf1bba68df49d716846f376e290712faeb7736ebfe0da7708979799a6a45418f67d43ed4a36eac73d4a00c + languageName: node + linkType: hard + +"@stylistic/eslint-plugin-ts@npm:^2.8.0": + version: 2.8.0 + resolution: "@stylistic/eslint-plugin-ts@npm:2.8.0" + dependencies: + "@typescript-eslint/utils": "npm:^8.4.0" + eslint-visitor-keys: "npm:^4.0.0" + espree: "npm:^10.1.0" + peerDependencies: + eslint: ">=8.40.0" + checksum: 10c0/74cfa44933ca39431d96cb6e7d13e5277c2aabbfeb49c017757feaf78827327f34d6047021c8ad258d89bf756922b3bcc4563b3040a3859c44044269aecc25a8 + languageName: node + linkType: hard + +"@stylistic/eslint-plugin@npm:^2.8.0": + version: 2.8.0 + resolution: "@stylistic/eslint-plugin@npm:2.8.0" + dependencies: + "@typescript-eslint/utils": "npm:^8.4.0" + eslint-visitor-keys: "npm:^4.0.0" + espree: "npm:^10.1.0" + estraverse: "npm:^5.3.0" + picomatch: "npm:^4.0.2" + peerDependencies: + eslint: ">=8.40.0" + checksum: 10c0/e85fc3ecad6df8b18e4c8e25ae4dfb330565efe5b91176fa84ec0fb636f07b1efa75eddc91fb36d146fc983a3538efc294f04d4b5636b3a708da123c70470671 + languageName: node + linkType: hard + +"@tokenizer/token@npm:^0.3.0": + version: 0.3.0 + resolution: "@tokenizer/token@npm:0.3.0" + checksum: 10c0/7ab9a822d4b5ff3f5bca7f7d14d46bdd8432528e028db4a52be7fbf90c7f495cc1af1324691dda2813c6af8dc4b8eb29de3107d4508165f9aa5b53e7d501f155 + languageName: node + linkType: hard + +"@types/chalk@npm:^2.2.0": + version: 2.2.0 + resolution: "@types/chalk@npm:2.2.0" + dependencies: + chalk: "npm:*" + checksum: 10c0/d408e65041f37db0211574d72300058538beac430bd636e6ebc51fad15e954de35796dea42ab9706b0f1f96c15d2e68dce14de22d7a0755270a6d86ac2813390 + languageName: node + linkType: hard + +"@types/color-convert@npm:*": + version: 2.0.3 + resolution: "@types/color-convert@npm:2.0.3" + dependencies: + "@types/color-name": "npm:*" + checksum: 10c0/a5870547660f426cddd76b54e942703e29c3b43fc26b1ba567e10b9707d144b7d8863e0af7affd9c3391815c06582571f43835c71ede270a6c58949155d18b77 + languageName: node + linkType: hard + +"@types/color-name@npm:*": + version: 1.1.4 + resolution: "@types/color-name@npm:1.1.4" + checksum: 10c0/11a5b67408a53a972fa98e4bbe2b0ff4cb74a3b3abb5f250cb5ec7b055a45aa8e00ddaf39b8327ef683ede9b2ff9b3ee9d25cd708d12b1b6a9aee5e8e6002920 + languageName: node + linkType: hard + +"@types/color@npm:^3.0.3": + version: 3.0.6 + resolution: "@types/color@npm:3.0.6" + dependencies: + "@types/color-convert": "npm:*" + checksum: 10c0/79267eeb67f9d11761aecee36bb1503fb8daa699b9ae7e036fc23a74380e5b130c5c0f6d7adafabba89256e46f36ee4d3e28e0ac7e107e8258550eae7d091acf + languageName: node + linkType: hard + +"@types/estree@npm:^1.0.6": + version: 1.0.6 + resolution: "@types/estree@npm:1.0.6" + checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a + languageName: node + linkType: hard + +"@types/json-schema@npm:^7.0.15": + version: 7.0.15 + resolution: "@types/json-schema@npm:7.0.15" + checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db + languageName: node + linkType: hard + +"@types/lodash@npm:^4.14.199": + version: 4.17.9 + resolution: "@types/lodash@npm:4.17.9" + checksum: 10c0/54de935e835508b5f835a5dfaedd2b9a299685a21d11e9c5cd2dde57331d03bc2f98b71d2424ca8460f447ecd55a673e45ccdb70e58f9f72745710f6b91abc60 + languageName: node + linkType: hard + +"@types/minimist@npm:^1.2.2": + version: 1.2.5 + resolution: "@types/minimist@npm:1.2.5" + checksum: 10c0/3f791258d8e99a1d7d0ca2bda1ca6ea5a94e5e7b8fc6cde84dd79b0552da6fb68ade750f0e17718f6587783c24254bbca0357648dd59dc3812c150305cabdc46 + languageName: node + linkType: hard + +"@types/node-fetch@npm:^2.6.2": + version: 2.6.11 + resolution: "@types/node-fetch@npm:2.6.11" + dependencies: + "@types/node": "npm:*" + form-data: "npm:^4.0.0" + checksum: 10c0/5283d4e0bcc37a5b6d8e629aee880a4ffcfb33e089f4b903b2981b19c623972d1e64af7c3f9540ab990f0f5c89b9b5dda19c5bcb37a8e177079e93683bfd2f49 + languageName: node + linkType: hard + +"@types/node@npm:*": + version: 22.7.0 + resolution: "@types/node@npm:22.7.0" + dependencies: + undici-types: "npm:~6.19.2" + checksum: 10c0/127b1ac3eebe8c2b09e3d2de277ee906710c4908b4573cde23b9c7cec1cb1aaf1af8bdabbccdac08d005f820b770e7447b22c8eb56ca63344f4d2e26bcdc29fb + languageName: node + linkType: hard + +"@types/node@npm:^16.11.38": + version: 16.18.109 + resolution: "@types/node@npm:16.18.109" + checksum: 10c0/0ae5b79a699031ccccff682d2a762f4a7fa25bd5d53c942d36a2aa33abf89b7caa0d9c02329a82ee30b2e4a15ae6097a110c58f347e2667f28eccfbc1b1443ee + languageName: node + linkType: hard + +"@types/normalize-package-data@npm:^2.4.0": + version: 2.4.4 + resolution: "@types/normalize-package-data@npm:2.4.4" + checksum: 10c0/aef7bb9b015883d6f4119c423dd28c4bdc17b0e8a0ccf112c78b4fe0e91fbc4af7c6204b04bba0e199a57d2f3fbbd5b4a14bf8739bf9d2a39b2a0aad545e0f86 + languageName: node + linkType: hard + +"@types/triple-beam@npm:^1.3.2": + version: 1.3.5 + resolution: "@types/triple-beam@npm:1.3.5" + checksum: 10c0/d5d7f25da612f6d79266f4f1bb9c1ef8f1684e9f60abab251e1261170631062b656ba26ff22631f2760caeafd372abc41e64867cde27fba54fafb73a35b9056a + languageName: node + linkType: hard + +"@types/uuid@npm:^9.0.8": + version: 9.0.8 + resolution: "@types/uuid@npm:9.0.8" + checksum: 10c0/b411b93054cb1d4361919579ef3508a1f12bf15b5fdd97337d3d351bece6c921b52b6daeef89b62340fd73fd60da407878432a1af777f40648cbe53a01723489 + languageName: node + linkType: hard + +"@typescript-eslint/eslint-plugin@npm:8.7.0, @typescript-eslint/eslint-plugin@npm:^8.6.0": + version: 8.7.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.7.0" + dependencies: + "@eslint-community/regexpp": "npm:^4.10.0" + "@typescript-eslint/scope-manager": "npm:8.7.0" + "@typescript-eslint/type-utils": "npm:8.7.0" + "@typescript-eslint/utils": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.0" + graphemer: "npm:^1.4.0" + ignore: "npm:^5.3.1" + natural-compare: "npm:^1.4.0" + ts-api-utils: "npm:^1.3.0" + peerDependencies: + "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0 + eslint: ^8.57.0 || ^9.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/f04d6fa6a30e32d51feba0f08789f75ca77b6b67cfe494bdbd9aafa241871edc918fa8b344dc9d13dd59ae055d42c3920f0e542534f929afbfdca653dae598fa + languageName: node + linkType: hard + +"@typescript-eslint/parser@npm:8.7.0, @typescript-eslint/parser@npm:^8.6.0": + version: 8.7.0 + resolution: "@typescript-eslint/parser@npm:8.7.0" + dependencies: + "@typescript-eslint/scope-manager": "npm:8.7.0" + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/typescript-estree": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.0" + debug: "npm:^4.3.4" + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/1d5020ff1f5d3eb726bc6034d23f0a71e8fe7a713756479a0a0b639215326f71c0b44e2c25cc290b4e7c144bd3c958f1405199711c41601f0ea9174068714a64 + languageName: node + linkType: hard + +"@typescript-eslint/scope-manager@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/scope-manager@npm:8.7.0" + dependencies: + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.0" + checksum: 10c0/8b731a0d0bd3e8f6a322b3b25006f56879b5d2aad86625070fa438b803cf938cb8d5c597758bfa0d65d6e142b204dc6f363fa239bc44280a74e25aa427408eda + languageName: node + linkType: hard + +"@typescript-eslint/type-utils@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/type-utils@npm:8.7.0" + dependencies: + "@typescript-eslint/typescript-estree": "npm:8.7.0" + "@typescript-eslint/utils": "npm:8.7.0" + debug: "npm:^4.3.4" + ts-api-utils: "npm:^1.3.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/2bd9fb93a50ff1c060af41528e39c775ae93b09dd71450defdb42a13c68990dd388460ae4e81fb2f4a49c38dc12152c515d43e845eca6198c44b14aab66733bc + languageName: node + linkType: hard + +"@typescript-eslint/types@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/types@npm:8.7.0" + checksum: 10c0/f7529eaea4ecc0f5e2d94ea656db8f930f6d1c1e65a3ffcb2f6bec87361173de2ea981405c2c483a35a927b3bdafb606319a1d0395a6feb1284448c8ba74c31e + languageName: node + linkType: hard + +"@typescript-eslint/typescript-estree@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.7.0" + dependencies: + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.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: 10c0/d714605b6920a9631ab1511b569c1c158b1681c09005ab240125c442a63e906048064151a61ce5eb5f8fe75cea861ce5ae1d87be9d7296b012e4ab6d88755e8b + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:8.7.0, @typescript-eslint/utils@npm:^8.1.0, @typescript-eslint/utils@npm:^8.4.0": + version: 8.7.0 + resolution: "@typescript-eslint/utils@npm:8.7.0" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@typescript-eslint/scope-manager": "npm:8.7.0" + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/typescript-estree": "npm:8.7.0" + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + checksum: 10c0/7355b754ce2fc118773ed27a3e02b7dfae270eec73c2d896738835ecf842e8309544dfd22c5105aba6cae2787bfdd84129bbc42f4b514f57909dc7f6890b8eba + languageName: node + linkType: hard + +"@typescript-eslint/visitor-keys@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.7.0" + dependencies: + "@typescript-eslint/types": "npm:8.7.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10c0/1240da13c15f9f875644b933b0ad73713ef12f1db5715236824c1ec359e6ef082ce52dd9b2186d40e28be6a816a208c226e6e9af96e5baeb24b4399fe786ae7c + languageName: node + linkType: hard + +"@voxpelli/config-array-find-files@npm:^0.1.2": + version: 0.1.2 + resolution: "@voxpelli/config-array-find-files@npm:0.1.2" + dependencies: + "@nodelib/fs.walk": "npm:^2.0.0" + peerDependencies: + "@eslint/config-array": ">=0.16.0" + checksum: 10c0/c7b1e8e674cf7e880c07374cb8091705d75dc85214c0c5a1fc10dd6e0bfe0f16a00b093e79fb22fe2bfbd3027cfc49adef0979c70a92c85c0395d1b1835657ab + languageName: node + linkType: hard + +"abbrev@npm:1": + version: 1.1.1 + resolution: "abbrev@npm:1.1.1" + checksum: 10c0/3f762677702acb24f65e813070e306c61fafe25d4b2583f9dfc935131f774863f3addd5741572ed576bd69cabe473c5af18e1e108b829cb7b6b4747884f726e6 + languageName: node + linkType: hard + +"abbrev@npm:^2.0.0": + version: 2.0.0 + resolution: "abbrev@npm:2.0.0" + checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372 + languageName: node + linkType: hard + +"abort-controller@npm:^3.0.0": + version: 3.0.0 + resolution: "abort-controller@npm:3.0.0" + dependencies: + event-target-shim: "npm:^5.0.0" + checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5 + languageName: node + linkType: hard + +"abstract-logging@npm:^2.0.1": + version: 2.0.1 + resolution: "abstract-logging@npm:2.0.1" + checksum: 10c0/304879d9babcf6772260e5ddde632e6428e1f42f7a7a116d4689e97ad813a20e0ec2dd1e0a122f3617557f40091b9ca85735de4b48c17a2041268cb47b3f8ef1 + languageName: node + linkType: hard + +"acorn-jsx@npm:^5.3.2": + version: 5.3.2 + resolution: "acorn-jsx@npm:5.3.2" + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1 + languageName: node + linkType: hard + +"acorn@npm:^8.11.3, acorn@npm:^8.12.0": + version: 8.12.1 + resolution: "acorn@npm:8.12.1" + bin: + acorn: bin/acorn + checksum: 10c0/51fb26cd678f914e13287e886da2d7021f8c2bc0ccc95e03d3e0447ee278dd3b40b9c57dc222acd5881adcf26f3edc40901a4953403232129e3876793cd17386 + languageName: node + linkType: hard + +"agent-base@npm:6": + version: 6.0.2 + resolution: "agent-base@npm:6.0.2" + dependencies: + debug: "npm:4" + checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261 + languageName: node + linkType: hard + +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": + version: 7.1.1 + resolution: "agent-base@npm:7.1.1" + dependencies: + debug: "npm:^4.3.4" + checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50 + languageName: node + linkType: hard + +"aggregate-error@npm:^3.0.0": + version: 3.1.0 + resolution: "aggregate-error@npm:3.1.0" + dependencies: + clean-stack: "npm:^2.0.0" + indent-string: "npm:^4.0.0" + checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039 + languageName: node + linkType: hard + +"aggregate-error@npm:^4.0.0": + version: 4.0.1 + resolution: "aggregate-error@npm:4.0.1" + dependencies: + clean-stack: "npm:^4.0.0" + indent-string: "npm:^5.0.0" + checksum: 10c0/75fd739f5c4c60a667cce35ccaf0edf135e147ef0be9a029cab75de14ac9421779b15339d562e58d25b233ea0ef2bbd4c916f149fdbcb73c2b9a62209e611343 + languageName: node + linkType: hard + +"ajv-formats@npm:^3.0.1": + version: 3.0.1 + resolution: "ajv-formats@npm:3.0.1" + dependencies: + ajv: "npm:^8.0.0" + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: 10c0/168d6bca1ea9f163b41c8147bae537e67bd963357a5488a1eaf3abe8baa8eec806d4e45f15b10767e6020679315c7e1e5e6803088dfb84efa2b4e9353b83dd0a + languageName: node + linkType: hard + +"ajv@npm:^6.12.4": + version: 6.12.6 + resolution: "ajv@npm:6.12.6" + dependencies: + fast-deep-equal: "npm:^3.1.1" + fast-json-stable-stringify: "npm:^2.0.0" + json-schema-traverse: "npm:^0.4.1" + uri-js: "npm:^4.2.2" + checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71 + languageName: node + linkType: hard + +"ajv@npm:^8.0.0, ajv@npm:^8.12.0": + version: 8.17.1 + resolution: "ajv@npm:8.17.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^3.0.1" + json-schema-traverse: "npm:^1.0.0" + require-from-string: "npm:^2.0.2" + checksum: 10c0/ec3ba10a573c6b60f94639ffc53526275917a2df6810e4ab5a6b959d87459f9ef3f00d5e7865b82677cb7d21590355b34da14d1d0b9c32d75f95a187e76fff35 + languageName: node + linkType: hard + +"ansi-regex@npm:^5.0.1": + version: 5.0.1 + resolution: "ansi-regex@npm:5.0.1" + checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737 + languageName: node + linkType: hard + +"ansi-regex@npm:^6.0.1": + version: 6.1.0 + resolution: "ansi-regex@npm:6.1.0" + checksum: 10c0/a91daeddd54746338478eef88af3439a7edf30f8e23196e2d6ed182da9add559c601266dbef01c2efa46a958ad6f1f8b176799657616c702b5b02e799e7fd8dc + languageName: node + linkType: hard + +"ansi-styles@npm:^3.2.1": + version: 3.2.1 + resolution: "ansi-styles@npm:3.2.1" + dependencies: + color-convert: "npm:^1.9.0" + checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b + languageName: node + linkType: hard + +"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0": + version: 4.3.0 + resolution: "ansi-styles@npm:4.3.0" + dependencies: + color-convert: "npm:^2.0.1" + checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041 + languageName: node + linkType: hard + +"ansi-styles@npm:^6.1.0": + version: 6.2.1 + resolution: "ansi-styles@npm:6.2.1" + checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c + languageName: node + linkType: hard + +"anymatch@npm:~3.1.2": + version: 3.1.3 + resolution: "anymatch@npm:3.1.3" + dependencies: + normalize-path: "npm:^3.0.0" + picomatch: "npm:^2.0.4" + checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac + languageName: node + linkType: hard + +"api@workspace:.": + version: 0.0.0-use.local + resolution: "api@workspace:." + dependencies: + "@eslint/config-inspector": "npm:^0.5.4" + "@prisma/client": "npm:5.20.0" + "@sinclair/typebox": "npm:^0.33.12" + "@stylistic/eslint-plugin": "npm:^2.8.0" + "@stylistic/eslint-plugin-ts": "npm:^2.8.0" + "@types/chalk": "npm:^2.2.0" + "@types/color": "npm:^3.0.3" + "@types/lodash": "npm:^4.14.199" + "@types/node": "npm:^16.11.38" + "@types/node-fetch": "npm:^2.6.2" + "@types/uuid": "npm:^9.0.8" + "@typescript-eslint/eslint-plugin": "npm:^8.6.0" + "@typescript-eslint/parser": "npm:^8.6.0" + buffer-image-size: "npm:^0.6.4" + canvas: "npm:2.11.2" + chalk: "npm:^5.1.2" + color: "npm:^4.2.3" + del-cli: "npm:^5.1.0" + dotenv: "npm:^16.0.3" + eris: "npm:^0.17.1" + eslint: "npm:^9.0.0" + eslint-plugin-import-x: "npm:^4.2.1" + fastify: "npm:^5.0.0" + file-type: "npm:^18.0.0" + lodash: "npm:^4.17.21" + node-fetch: "npm:^3.3.0" + node-worker-threads-pool: "npm:^1.5.1" + pb-text-format-to-json: "npm:^1.1.1" + prisma: "npm:5.20.0" + sharp: "npm:^0.33.4" + typescript: "npm:^5.6.2" + typescript-eslint: "npm:^8.6.0" + uuid: "npm:^9.0.0" + uuid-by-string: "npm:^4.0.0" + winston: "npm:^3.11.0" + languageName: unknown + linkType: soft + +"aproba@npm:^1.0.3 || ^2.0.0": + version: 2.0.0 + resolution: "aproba@npm:2.0.0" + checksum: 10c0/d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5 + languageName: node + linkType: hard + +"are-we-there-yet@npm:^2.0.0": + version: 2.0.0 + resolution: "are-we-there-yet@npm:2.0.0" + dependencies: + delegates: "npm:^1.0.0" + readable-stream: "npm:^3.6.0" + checksum: 10c0/375f753c10329153c8d66dc95e8f8b6c7cc2aa66e05cb0960bd69092b10dae22900cacc7d653ad11d26b3ecbdbfe1e8bfb6ccf0265ba8077a7d979970f16b99c + languageName: node + linkType: hard + +"argparse@npm:^2.0.1": + version: 2.0.1 + resolution: "argparse@npm:2.0.1" + checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e + languageName: node + linkType: hard + +"arrify@npm:^1.0.1": + version: 1.0.1 + resolution: "arrify@npm:1.0.1" + checksum: 10c0/c35c8d1a81bcd5474c0c57fe3f4bad1a4d46a5fa353cedcff7a54da315df60db71829e69104b859dff96c5d68af46bd2be259fe5e50dc6aa9df3b36bea0383ab + languageName: node + linkType: hard + +"async@npm:^3.2.3": + version: 3.2.6 + resolution: "async@npm:3.2.6" + checksum: 10c0/36484bb15ceddf07078688d95e27076379cc2f87b10c03b6dd8a83e89475a3c8df5848859dd06a4c95af1e4c16fc973de0171a77f18ea00be899aca2a4f85e70 + languageName: node + linkType: hard + +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d + languageName: node + linkType: hard + +"atomic-sleep@npm:^1.0.0": + version: 1.0.0 + resolution: "atomic-sleep@npm:1.0.0" + checksum: 10c0/e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a + languageName: node + linkType: hard + +"avvio@npm:^9.0.0": + version: 9.0.0 + resolution: "avvio@npm:9.0.0" + dependencies: + "@fastify/error": "npm:^4.0.0" + fastq: "npm:^1.17.1" + checksum: 10c0/d44527023141b330fc6ded974ad13cd1144b03471a1f136beb03525aff9f1c1721b963ef0f9c2906536367b14dcd41fffcadef8bae2786ae29ab4216c3092cf9 + languageName: node + linkType: hard + +"balanced-match@npm:^1.0.0": + version: 1.0.2 + resolution: "balanced-match@npm:1.0.2" + checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee + languageName: node + linkType: hard + +"base64-js@npm:^1.3.1": + version: 1.5.1 + resolution: "base64-js@npm:1.5.1" + checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf + languageName: node + linkType: hard + +"binary-extensions@npm:^2.0.0": + version: 2.3.0 + resolution: "binary-extensions@npm:2.3.0" + checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5 + languageName: node + linkType: hard + +"brace-expansion@npm:^1.1.7": + version: 1.1.11 + resolution: "brace-expansion@npm:1.1.11" + dependencies: + balanced-match: "npm:^1.0.0" + concat-map: "npm:0.0.1" + checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668 + languageName: node + linkType: hard + +"brace-expansion@npm:^2.0.1": + version: 2.0.1 + resolution: "brace-expansion@npm:2.0.1" + dependencies: + balanced-match: "npm:^1.0.0" + checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f + languageName: node + linkType: hard + +"braces@npm:^3.0.3, braces@npm:~3.0.2": + version: 3.0.3 + resolution: "braces@npm:3.0.3" + dependencies: + fill-range: "npm:^7.1.1" + checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04 + languageName: node + linkType: hard + +"buffer-image-size@npm:^0.6.4": + version: 0.6.4 + resolution: "buffer-image-size@npm:0.6.4" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/7158205c8726caa521d3ae6ef7bc341eff211ff86f7278d122e45062e1720afef2f7ad8e845edc96c04f499b292c4ec8a74df9836a25074881260ba00b863448 + languageName: node + linkType: hard + +"buffer@npm:^6.0.3": + version: 6.0.3 + resolution: "buffer@npm:6.0.3" + dependencies: + base64-js: "npm:^1.3.1" + ieee754: "npm:^1.2.1" + checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0 + languageName: node + linkType: hard + +"bundle-name@npm:^4.1.0": + version: 4.1.0 + resolution: "bundle-name@npm:4.1.0" + dependencies: + run-applescript: "npm:^7.0.0" + checksum: 10c0/8e575981e79c2bcf14d8b1c027a3775c095d362d1382312f444a7c861b0e21513c0bd8db5bd2b16e50ba0709fa622d4eab6b53192d222120305e68359daece29 + languageName: node + linkType: hard + +"bundle-require@npm:^5.0.0": + version: 5.0.0 + resolution: "bundle-require@npm:5.0.0" + dependencies: + load-tsconfig: "npm:^0.2.3" + peerDependencies: + esbuild: ">=0.18" + checksum: 10c0/92c46df02586e0ebd66ee4831c9b5775adb3c32a43fe2b2aaf7bc675135c141f751de6a9a26b146d64c607c5b40f9eef5f10dce3c364f602d4bed268444c32c6 + languageName: node + linkType: hard + +"cac@npm:^6.7.14": + version: 6.7.14 + resolution: "cac@npm:6.7.14" + checksum: 10c0/4ee06aaa7bab8981f0d54e5f5f9d4adcd64058e9697563ce336d8a3878ed018ee18ebe5359b2430eceae87e0758e62ea2019c3f52ae6e211b1bd2e133856cd10 + languageName: node + linkType: hard + +"cacache@npm:^18.0.0": + version: 18.0.4 + resolution: "cacache@npm:18.0.4" + dependencies: + "@npmcli/fs": "npm:^3.1.0" + fs-minipass: "npm:^3.0.0" + glob: "npm:^10.2.2" + lru-cache: "npm:^10.0.1" + minipass: "npm:^7.0.3" + minipass-collect: "npm:^2.0.1" + minipass-flush: "npm:^1.0.5" + minipass-pipeline: "npm:^1.2.4" + p-map: "npm:^4.0.0" + ssri: "npm:^10.0.0" + tar: "npm:^6.1.11" + unique-filename: "npm:^3.0.0" + checksum: 10c0/6c055bafed9de4f3dcc64ac3dc7dd24e863210902b7c470eb9ce55a806309b3efff78033e3d8b4f7dcc5d467f2db43c6a2857aaaf26f0094b8a351d44c42179f + languageName: node + linkType: hard + +"callsites@npm:^3.0.0": + version: 3.1.0 + resolution: "callsites@npm:3.1.0" + checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301 + languageName: node + linkType: hard + +"camelcase-keys@npm:^7.0.0": + version: 7.0.2 + resolution: "camelcase-keys@npm:7.0.2" + dependencies: + camelcase: "npm:^6.3.0" + map-obj: "npm:^4.1.0" + quick-lru: "npm:^5.1.1" + type-fest: "npm:^1.2.1" + checksum: 10c0/ae86a51168643e9e8a2f2c7bfa17850729979ec3dafc5253056a7d97931cbb0e3ef5b4185e59d54b7a56c54405dee2874b0c82033498d8626e512ff9034cb05c + languageName: node + linkType: hard + +"camelcase@npm:^6.3.0": + version: 6.3.0 + resolution: "camelcase@npm:6.3.0" + checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710 + languageName: node + linkType: hard + +"canvas@npm:2.11.2": + version: 2.11.2 + resolution: "canvas@npm:2.11.2" + dependencies: + "@mapbox/node-pre-gyp": "npm:^1.0.0" + nan: "npm:^2.17.0" + node-gyp: "npm:latest" + simple-get: "npm:^3.0.3" + checksum: 10c0/943368798ad1b66b18633aa34b6181e1038dac5433fc9727cd07be35f0a633f572b60d9edb95f5ff90b6a9128e86d5312035f91a2934101c73185b15d906230a + languageName: node + linkType: hard + +"chalk@npm:*, chalk@npm:^5.1.2": + version: 5.3.0 + resolution: "chalk@npm:5.3.0" + checksum: 10c0/8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09 + languageName: node + linkType: hard + +"chalk@npm:^2.4.2": + version: 2.4.2 + resolution: "chalk@npm:2.4.2" + dependencies: + ansi-styles: "npm:^3.2.1" + escape-string-regexp: "npm:^1.0.5" + supports-color: "npm:^5.3.0" + checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073 + languageName: node + linkType: hard + +"chalk@npm:^4.0.0": + version: 4.1.2 + resolution: "chalk@npm:4.1.2" + dependencies: + ansi-styles: "npm:^4.1.0" + supports-color: "npm:^7.1.0" + checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880 + languageName: node + linkType: hard + +"chokidar@npm:^3.6.0": + version: 3.6.0 + resolution: "chokidar@npm:3.6.0" + dependencies: + anymatch: "npm:~3.1.2" + braces: "npm:~3.0.2" + fsevents: "npm:~2.3.2" + glob-parent: "npm:~5.1.2" + is-binary-path: "npm:~2.1.0" + is-glob: "npm:~4.0.1" + normalize-path: "npm:~3.0.0" + readdirp: "npm:~3.6.0" + dependenciesMeta: + fsevents: + optional: true + checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462 + languageName: node + linkType: hard + +"chownr@npm:^2.0.0": + version: 2.0.0 + resolution: "chownr@npm:2.0.0" + checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6 + languageName: node + linkType: hard + +"clean-stack@npm:^2.0.0": + version: 2.2.0 + resolution: "clean-stack@npm:2.2.0" + checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1 + languageName: node + linkType: hard + +"clean-stack@npm:^4.0.0": + version: 4.2.0 + resolution: "clean-stack@npm:4.2.0" + dependencies: + escape-string-regexp: "npm:5.0.0" + checksum: 10c0/2bdf981a0fef0a23c14255df693b30eb9ae27eedf212470d8c400a0c0b6fb82fbf1ff8c5216ccd5721e3670b700389c886b1dce5070776dc9fbcc040957758c0 + languageName: node + linkType: hard + +"color-convert@npm:^1.9.0, color-convert@npm:^1.9.3": + version: 1.9.3 + resolution: "color-convert@npm:1.9.3" + dependencies: + color-name: "npm:1.1.3" + checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c + languageName: node + linkType: hard + +"color-convert@npm:^2.0.1": + version: 2.0.1 + resolution: "color-convert@npm:2.0.1" + dependencies: + color-name: "npm:~1.1.4" + checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7 + languageName: node + linkType: hard + +"color-name@npm:1.1.3": + version: 1.1.3 + resolution: "color-name@npm:1.1.3" + checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6 + languageName: node + linkType: hard + +"color-name@npm:^1.0.0, color-name@npm:~1.1.4": + version: 1.1.4 + resolution: "color-name@npm:1.1.4" + checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95 + languageName: node + linkType: hard + +"color-string@npm:^1.6.0, color-string@npm:^1.9.0": + version: 1.9.1 + resolution: "color-string@npm:1.9.1" + dependencies: + color-name: "npm:^1.0.0" + simple-swizzle: "npm:^0.2.2" + checksum: 10c0/b0bfd74c03b1f837f543898b512f5ea353f71630ccdd0d66f83028d1f0924a7d4272deb278b9aef376cacf1289b522ac3fb175e99895283645a2dc3a33af2404 + languageName: node + linkType: hard + +"color-support@npm:^1.1.2": + version: 1.1.3 + resolution: "color-support@npm:1.1.3" + bin: + color-support: bin.js + checksum: 10c0/8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6 + languageName: node + linkType: hard + +"color@npm:^3.1.3": + version: 3.2.1 + resolution: "color@npm:3.2.1" + dependencies: + color-convert: "npm:^1.9.3" + color-string: "npm:^1.6.0" + checksum: 10c0/39345d55825884c32a88b95127d417a2c24681d8b57069413596d9fcbb721459ef9d9ec24ce3e65527b5373ce171b73e38dbcd9c830a52a6487e7f37bf00e83c + languageName: node + linkType: hard + +"color@npm:^4.2.3": + version: 4.2.3 + resolution: "color@npm:4.2.3" + dependencies: + color-convert: "npm:^2.0.1" + color-string: "npm:^1.9.0" + checksum: 10c0/7fbe7cfb811054c808349de19fb380252e5e34e61d7d168ec3353e9e9aacb1802674bddc657682e4e9730c2786592a4de6f8283e7e0d3870b829bb0b7b2f6118 + languageName: node + linkType: hard + +"colorspace@npm:1.1.x": + version: 1.1.4 + resolution: "colorspace@npm:1.1.4" + dependencies: + color: "npm:^3.1.3" + text-hex: "npm:1.0.x" + checksum: 10c0/af5f91ff7f8e146b96e439ac20ed79b197210193bde721b47380a75b21751d90fa56390c773bb67c0aedd34ff85091883a437ab56861c779bd507d639ba7e123 + languageName: node + linkType: hard + +"combined-stream@npm:^1.0.8": + version: 1.0.8 + resolution: "combined-stream@npm:1.0.8" + dependencies: + delayed-stream: "npm:~1.0.0" + checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5 + languageName: node + linkType: hard + +"concat-map@npm:0.0.1": + version: 0.0.1 + resolution: "concat-map@npm:0.0.1" + checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f + languageName: node + linkType: hard + +"confbox@npm:^0.1.7": + version: 0.1.7 + resolution: "confbox@npm:0.1.7" + checksum: 10c0/18b40c2f652196a833f3f1a5db2326a8a579cd14eacabfe637e4fc8cb9b68d7cf296139a38c5e7c688ce5041bf46f9adce05932d43fde44cf7e012840b5da111 + languageName: node + linkType: hard + +"consola@npm:^3.2.3": + version: 3.2.3 + resolution: "consola@npm:3.2.3" + checksum: 10c0/c606220524ec88a05bb1baf557e9e0e04a0c08a9c35d7a08652d99de195c4ddcb6572040a7df57a18ff38bbc13ce9880ad032d56630cef27bef72768ef0ac078 + languageName: node + linkType: hard + +"console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0": + version: 1.1.0 + resolution: "console-control-strings@npm:1.1.0" + checksum: 10c0/7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50 + languageName: node + linkType: hard + +"cookie-es@npm:^1.1.0": + version: 1.2.2 + resolution: "cookie-es@npm:1.2.2" + checksum: 10c0/210eb67cd40a53986fda99d6f47118cfc45a69c4abc03490d15ab1b83ac978d5518356aecdd7a7a4969292445e3063c2302deda4c73706a67edc008127608638 + languageName: node + linkType: hard + +"cookie@npm:^0.6.0": + version: 0.6.0 + resolution: "cookie@npm:0.6.0" + checksum: 10c0/f2318b31af7a31b4ddb4a678d024514df5e705f9be5909a192d7f116cfb6d45cbacf96a473fa733faa95050e7cff26e7832bb3ef94751592f1387b71c8956686 + languageName: node + linkType: hard + +"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2": + version: 7.0.3 + resolution: "cross-spawn@npm:7.0.3" + dependencies: + path-key: "npm:^3.1.0" + shebang-command: "npm:^2.0.0" + which: "npm:^2.0.1" + checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750 + languageName: node + linkType: hard + +"crossws@npm:^0.2.4": + version: 0.2.4 + resolution: "crossws@npm:0.2.4" + peerDependencies: + uWebSockets.js: "*" + peerDependenciesMeta: + uWebSockets.js: + optional: true + checksum: 10c0/b950c64d36f3f11fdb8e0faf3107598660d89d77eb860e68b535fe6acba9f0f2f0507cc7250bd219a3ef2fe08718db91b591e6912b7324fcfc8fd1b8d9f78c96 + languageName: node + linkType: hard + +"data-uri-to-buffer@npm:^4.0.0": + version: 4.0.1 + resolution: "data-uri-to-buffer@npm:4.0.1" + checksum: 10c0/20a6b93107597530d71d4cb285acee17f66bcdfc03fd81040921a81252f19db27588d87fc8fc69e1950c55cfb0bf8ae40d0e5e21d907230813eb5d5a7f9eb45b + languageName: node + linkType: hard + +"debug@npm:4, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": + version: 4.3.7 + resolution: "debug@npm:4.3.7" + dependencies: + ms: "npm:^2.1.3" + peerDependenciesMeta: + supports-color: + optional: true + checksum: 10c0/1471db19c3b06d485a622d62f65947a19a23fbd0dd73f7fd3eafb697eec5360cde447fb075919987899b1a2096e85d35d4eb5a4de09a57600ac9cf7e6c8e768b + languageName: node + linkType: hard + +"debug@npm:^3.2.7": + version: 3.2.7 + resolution: "debug@npm:3.2.7" + dependencies: + ms: "npm:^2.1.1" + checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a + languageName: node + linkType: hard + +"decamelize-keys@npm:^1.1.0": + version: 1.1.1 + resolution: "decamelize-keys@npm:1.1.1" + dependencies: + decamelize: "npm:^1.1.0" + map-obj: "npm:^1.0.0" + checksum: 10c0/4ca385933127437658338c65fb9aead5f21b28d3dd3ccd7956eb29aab0953b5d3c047fbc207111672220c71ecf7a4d34f36c92851b7bbde6fca1a02c541bdd7d + languageName: node + linkType: hard + +"decamelize@npm:^1.1.0": + version: 1.2.0 + resolution: "decamelize@npm:1.2.0" + checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2 + languageName: node + linkType: hard + +"decamelize@npm:^5.0.0": + version: 5.0.1 + resolution: "decamelize@npm:5.0.1" + checksum: 10c0/3da71022bc1e85487810fa0833138effb599fa331ca21e179650e93a765d0c4dabeb1ecdd6ad1474fa0bacd2457953c63ea335afb6e53b35f2b4bf779514e2a3 + languageName: node + linkType: hard + +"decompress-response@npm:^4.2.0": + version: 4.2.1 + resolution: "decompress-response@npm:4.2.1" + dependencies: + mimic-response: "npm:^2.0.0" + checksum: 10c0/5e4821be332e80e3639acee2441c41d245fc07ac3ee85a6f28893c10c079d66d9bf09e8d84bffeae5656a4625e09e9b93fb4a5705adbe6b07202eea64fae1c8d + languageName: node + linkType: hard + +"deep-is@npm:^0.1.3": + version: 0.1.4 + resolution: "deep-is@npm:0.1.4" + checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c + languageName: node + linkType: hard + +"default-browser-id@npm:^5.0.0": + version: 5.0.0 + resolution: "default-browser-id@npm:5.0.0" + checksum: 10c0/957fb886502594c8e645e812dfe93dba30ed82e8460d20ce39c53c5b0f3e2afb6ceaec2249083b90bdfbb4cb0f34e1f73fde3d68cac00becdbcfd894156b5ead + languageName: node + linkType: hard + +"default-browser@npm:^5.2.1": + version: 5.2.1 + resolution: "default-browser@npm:5.2.1" + dependencies: + bundle-name: "npm:^4.1.0" + default-browser-id: "npm:^5.0.0" + checksum: 10c0/73f17dc3c58026c55bb5538749597db31f9561c0193cd98604144b704a981c95a466f8ecc3c2db63d8bfd04fb0d426904834cfc91ae510c6aeb97e13c5167c4d + languageName: node + linkType: hard + +"define-lazy-prop@npm:^3.0.0": + version: 3.0.0 + resolution: "define-lazy-prop@npm:3.0.0" + checksum: 10c0/5ab0b2bf3fa58b3a443140bbd4cd3db1f91b985cc8a246d330b9ac3fc0b6a325a6d82bddc0b055123d745b3f9931afeea74a5ec545439a1630b9c8512b0eeb49 + languageName: node + linkType: hard + +"defu@npm:^6.1.4": + version: 6.1.4 + resolution: "defu@npm:6.1.4" + checksum: 10c0/2d6cc366262dc0cb8096e429368e44052fdf43ed48e53ad84cc7c9407f890301aa5fcb80d0995abaaf842b3949f154d060be4160f7a46cb2bc2f7726c81526f5 + languageName: node + linkType: hard + +"del-cli@npm:^5.1.0": + version: 5.1.0 + resolution: "del-cli@npm:5.1.0" + dependencies: + del: "npm:^7.1.0" + meow: "npm:^10.1.3" + bin: + del: cli.js + del-cli: cli.js + checksum: 10c0/555dfbbdf254ec758f86eaa3960779ae378c11fb9f734ba9f09b1019237919a66ffdaa286dad4b8df3cb8f315157fd41b6ff63afb7fa46a6c61eed7bbac04488 + languageName: node + linkType: hard + +"del@npm:^7.1.0": + version: 7.1.0 + resolution: "del@npm:7.1.0" + dependencies: + globby: "npm:^13.1.2" + graceful-fs: "npm:^4.2.10" + is-glob: "npm:^4.0.3" + is-path-cwd: "npm:^3.0.0" + is-path-inside: "npm:^4.0.0" + p-map: "npm:^5.5.0" + rimraf: "npm:^3.0.2" + slash: "npm:^4.0.0" + checksum: 10c0/5ad2777b69e386b414ba77f5eba23bb52422c096f4c084c0d1d829ee4776d1a025a6f69765906907c4137026e9bd071ee9d422fd531b1417ef546adc7eb6fada + languageName: node + linkType: hard + +"delayed-stream@npm:~1.0.0": + version: 1.0.0 + resolution: "delayed-stream@npm:1.0.0" + checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19 + languageName: node + linkType: hard + +"delegates@npm:^1.0.0": + version: 1.0.0 + resolution: "delegates@npm:1.0.0" + checksum: 10c0/ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5 + languageName: node + linkType: hard + +"destr@npm:^2.0.3": + version: 2.0.3 + resolution: "destr@npm:2.0.3" + checksum: 10c0/10e7eff5149e2839a4dd29a1e9617c3c675a3b53608d78d74fc6f4abc31daa977e6de08e0eea78965527a0d5a35467ae2f9624e0a4646d54aa1162caa094473e + languageName: node + linkType: hard + +"detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.3": + version: 2.0.3 + resolution: "detect-libc@npm:2.0.3" + checksum: 10c0/88095bda8f90220c95f162bf92cad70bd0e424913e655c20578600e35b91edc261af27531cf160a331e185c0ced93944bc7e09939143225f56312d7fd800fdb7 + languageName: node + linkType: hard + +"dir-glob@npm:^3.0.1": + version: 3.0.1 + resolution: "dir-glob@npm:3.0.1" + dependencies: + path-type: "npm:^4.0.0" + checksum: 10c0/dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c + 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: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520 + languageName: node + linkType: hard + +"dotenv@npm:^16.0.3": + version: 16.4.5 + resolution: "dotenv@npm:16.4.5" + checksum: 10c0/48d92870076832af0418b13acd6e5a5a3e83bb00df690d9812e94b24aff62b88ade955ac99a05501305b8dc8f1b0ee7638b18493deb6fe93d680e5220936292f + languageName: node + linkType: hard + +"eastasianwidth@npm:^0.2.0": + version: 0.2.0 + resolution: "eastasianwidth@npm:0.2.0" + checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39 + languageName: node + linkType: hard + +"emoji-regex@npm:^8.0.0": + version: 8.0.0 + resolution: "emoji-regex@npm:8.0.0" + checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010 + languageName: node + linkType: hard + +"emoji-regex@npm:^9.2.2": + version: 9.2.2 + resolution: "emoji-regex@npm:9.2.2" + checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639 + languageName: node + linkType: hard + +"enabled@npm:2.0.x": + version: 2.0.0 + resolution: "enabled@npm:2.0.0" + checksum: 10c0/3b2c2af9bc7f8b9e291610f2dde4a75cf6ee52a68f4dd585482fbdf9a55d65388940e024e56d40bb03e05ef6671f5f53021fa8b72a20e954d7066ec28166713f + languageName: node + linkType: hard + +"encoding@npm:^0.1.13": + version: 0.1.13 + resolution: "encoding@npm:0.1.13" + dependencies: + iconv-lite: "npm:^0.6.2" + checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039 + languageName: node + linkType: hard + +"env-paths@npm:^2.2.0": + version: 2.2.1 + resolution: "env-paths@npm:2.2.1" + checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4 + languageName: node + linkType: hard + +"eris@npm:^0.17.1": + version: 0.17.2 + resolution: "eris@npm:0.17.2" + dependencies: + opusscript: "npm:^0.0.8" + tweetnacl: "npm:^1.0.3" + ws: "npm:^8.2.3" + dependenciesMeta: + opusscript: + optional: true + tweetnacl: + optional: true + checksum: 10c0/74608d0daea43c34baffc1a44000703e06e37ed6fb26388c5f8e84aee7e635efceb1871af0bb8fcb523df2a7ed5577975db9cef08f173406f8d5e57bd43fc697 + languageName: node + linkType: hard + +"err-code@npm:^2.0.2": + version: 2.0.3 + resolution: "err-code@npm:2.0.3" + checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66 + languageName: node + linkType: hard + +"error-ex@npm:^1.3.1": + version: 1.3.2 + resolution: "error-ex@npm:1.3.2" + dependencies: + is-arrayish: "npm:^0.2.1" + checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce + languageName: node + linkType: hard + +"esbuild@npm:^0.21.5": + version: 0.21.5 + resolution: "esbuild@npm:0.21.5" + dependencies: + "@esbuild/aix-ppc64": "npm:0.21.5" + "@esbuild/android-arm": "npm:0.21.5" + "@esbuild/android-arm64": "npm:0.21.5" + "@esbuild/android-x64": "npm:0.21.5" + "@esbuild/darwin-arm64": "npm:0.21.5" + "@esbuild/darwin-x64": "npm:0.21.5" + "@esbuild/freebsd-arm64": "npm:0.21.5" + "@esbuild/freebsd-x64": "npm:0.21.5" + "@esbuild/linux-arm": "npm:0.21.5" + "@esbuild/linux-arm64": "npm:0.21.5" + "@esbuild/linux-ia32": "npm:0.21.5" + "@esbuild/linux-loong64": "npm:0.21.5" + "@esbuild/linux-mips64el": "npm:0.21.5" + "@esbuild/linux-ppc64": "npm:0.21.5" + "@esbuild/linux-riscv64": "npm:0.21.5" + "@esbuild/linux-s390x": "npm:0.21.5" + "@esbuild/linux-x64": "npm:0.21.5" + "@esbuild/netbsd-x64": "npm:0.21.5" + "@esbuild/openbsd-x64": "npm:0.21.5" + "@esbuild/sunos-x64": "npm:0.21.5" + "@esbuild/win32-arm64": "npm:0.21.5" + "@esbuild/win32-ia32": "npm:0.21.5" + "@esbuild/win32-x64": "npm:0.21.5" + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: 10c0/fa08508adf683c3f399e8a014a6382a6b65542213431e26206c0720e536b31c09b50798747c2a105a4bbba1d9767b8d3615a74c2f7bf1ddf6d836cd11eb672de + languageName: node + linkType: hard + +"escape-string-regexp@npm:5.0.0": + version: 5.0.0 + resolution: "escape-string-regexp@npm:5.0.0" + checksum: 10c0/6366f474c6f37a802800a435232395e04e9885919873e382b157ab7e8f0feb8fed71497f84a6f6a81a49aab41815522f5839112bd38026d203aea0c91622df95 + languageName: node + linkType: hard + +"escape-string-regexp@npm:^1.0.5": + version: 1.0.5 + resolution: "escape-string-regexp@npm:1.0.5" + checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371 + languageName: node + linkType: hard + +"escape-string-regexp@npm:^4.0.0": + version: 4.0.0 + resolution: "escape-string-regexp@npm:4.0.0" + checksum: 10c0/9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9 + languageName: node + linkType: hard + +"eslint-import-resolver-node@npm:^0.3.9": + version: 0.3.9 + resolution: "eslint-import-resolver-node@npm:0.3.9" + dependencies: + debug: "npm:^3.2.7" + is-core-module: "npm:^2.13.0" + resolve: "npm:^1.22.4" + checksum: 10c0/0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61 + languageName: node + linkType: hard + +"eslint-plugin-import-x@npm:^4.2.1": + version: 4.3.0 + resolution: "eslint-plugin-import-x@npm:4.3.0" + dependencies: + "@typescript-eslint/utils": "npm:^8.1.0" + debug: "npm:^4.3.4" + doctrine: "npm:^3.0.0" + eslint-import-resolver-node: "npm:^0.3.9" + get-tsconfig: "npm:^4.7.3" + is-glob: "npm:^4.0.3" + minimatch: "npm:^9.0.3" + semver: "npm:^7.6.3" + stable-hash: "npm:^0.0.4" + tslib: "npm:^2.6.3" + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + checksum: 10c0/46d8f6c3d49fd170a6cc0aecb435f353f9111bf6f612f01479a33b1e382a7b09fe70df764e0a0f21f804b5cdd80523f4781993f417b336fef00ec3f5488727e4 + languageName: node + linkType: hard + +"eslint-scope@npm:^8.0.2": + version: 8.0.2 + resolution: "eslint-scope@npm:8.0.2" + dependencies: + esrecurse: "npm:^4.3.0" + estraverse: "npm:^5.2.0" + checksum: 10c0/477f820647c8755229da913025b4567347fd1f0bf7cbdf3a256efff26a7e2e130433df052bd9e3d014025423dc00489bea47eb341002b15553673379c1a7dc36 + languageName: node + linkType: hard + +"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820 + languageName: node + linkType: hard + +"eslint-visitor-keys@npm:^4.0.0": + version: 4.0.0 + resolution: "eslint-visitor-keys@npm:4.0.0" + checksum: 10c0/76619f42cf162705a1515a6868e6fc7567e185c7063a05621a8ac4c3b850d022661262c21d9f1fc1d144ecf0d5d64d70a3f43c15c3fc969a61ace0fb25698cf5 + languageName: node + linkType: hard + +"eslint@npm:^9.0.0": + version: 9.11.1 + resolution: "eslint@npm:9.11.1" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.2.0" + "@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.11.1" + "@eslint/plugin-kit": "npm:^0.2.0" + "@humanwhocodes/module-importer": "npm:^1.0.1" + "@humanwhocodes/retry": "npm:^0.3.0" + "@nodelib/fs.walk": "npm:^1.2.8" + "@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" + escape-string-regexp: "npm:^4.0.0" + eslint-scope: "npm:^8.0.2" + eslint-visitor-keys: "npm:^4.0.0" + espree: "npm:^10.1.0" + esquery: "npm:^1.5.0" + esutils: "npm:^2.0.2" + fast-deep-equal: "npm:^3.1.3" + file-entry-cache: "npm:^8.0.0" + find-up: "npm:^5.0.0" + glob-parent: "npm:^6.0.2" + ignore: "npm:^5.2.0" + imurmurhash: "npm:^0.1.4" + is-glob: "npm:^4.0.0" + is-path-inside: "npm:^3.0.3" + json-stable-stringify-without-jsonify: "npm:^1.0.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: 10c0/fc9afc31155fef8c27fc4fd00669aeafa4b89ce5abfbf6f60e05482c03d7ff1d5e7546e416aa47bf0f28c9a56597a94663fd0264c2c42a1890f53cac49189f24 + languageName: node + linkType: hard + +"espree@npm:^10.0.1, espree@npm:^10.1.0": + version: 10.1.0 + resolution: "espree@npm:10.1.0" + dependencies: + acorn: "npm:^8.12.0" + acorn-jsx: "npm:^5.3.2" + eslint-visitor-keys: "npm:^4.0.0" + checksum: 10c0/52e6feaa77a31a6038f0c0e3fce93010a4625701925b0715cd54a2ae190b3275053a0717db698697b32653788ac04845e489d6773b508d6c2e8752f3c57470a0 + languageName: node + linkType: hard + +"esquery@npm:^1.5.0": + version: 1.6.0 + resolution: "esquery@npm:1.6.0" + dependencies: + estraverse: "npm:^5.1.0" + checksum: 10c0/cb9065ec605f9da7a76ca6dadb0619dfb611e37a81e318732977d90fab50a256b95fee2d925fba7c2f3f0523aa16f91587246693bc09bc34d5a59575fe6e93d2 + languageName: node + linkType: hard + +"esrecurse@npm:^4.3.0": + version: 4.3.0 + resolution: "esrecurse@npm:4.3.0" + dependencies: + estraverse: "npm:^5.2.0" + checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5 + languageName: node + linkType: hard + +"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0": + version: 5.3.0 + resolution: "estraverse@npm:5.3.0" + checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107 + languageName: node + linkType: hard + +"esutils@npm:^2.0.2": + version: 2.0.3 + resolution: "esutils@npm:2.0.3" + checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7 + languageName: node + linkType: hard + +"event-target-shim@npm:^5.0.0": + version: 5.0.1 + resolution: "event-target-shim@npm:5.0.1" + checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b + languageName: node + linkType: hard + +"events@npm:^3.3.0": + version: 3.3.0 + resolution: "events@npm:3.3.0" + checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6 + languageName: node + linkType: hard + +"exponential-backoff@npm:^3.1.1": + version: 3.1.1 + resolution: "exponential-backoff@npm:3.1.1" + checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579 + languageName: node + linkType: hard + +"fast-decode-uri-component@npm:^1.0.1": + version: 1.0.1 + resolution: "fast-decode-uri-component@npm:1.0.1" + checksum: 10c0/039d50c2e99d64f999c3f2126c23fbf75a04a4117e218a149ca0b1d2aeb8c834b7b19d643b9d35d4eabce357189a6a94085f78cf48869e6e26cc59b036284bc3 + languageName: node + linkType: hard + +"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": + version: 3.1.3 + resolution: "fast-deep-equal@npm:3.1.3" + checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0 + languageName: node + linkType: hard + +"fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2": + version: 3.3.2 + resolution: "fast-glob@npm:3.3.2" + dependencies: + "@nodelib/fs.stat": "npm:^2.0.2" + "@nodelib/fs.walk": "npm:^1.2.3" + glob-parent: "npm:^5.1.2" + merge2: "npm:^1.3.0" + micromatch: "npm:^4.0.4" + checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845 + languageName: node + linkType: hard + +"fast-json-stable-stringify@npm:^2.0.0": + version: 2.1.0 + resolution: "fast-json-stable-stringify@npm:2.1.0" + checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b + languageName: node + linkType: hard + +"fast-json-stringify@npm:^6.0.0": + version: 6.0.0 + resolution: "fast-json-stringify@npm:6.0.0" + dependencies: + "@fastify/merge-json-schemas": "npm:^0.1.1" + ajv: "npm:^8.12.0" + ajv-formats: "npm:^3.0.1" + fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^2.3.0" + json-schema-ref-resolver: "npm:^1.0.1" + rfdc: "npm:^1.2.0" + checksum: 10c0/590bbb284df45972822773ebc41c8592c412cc8c2d123d43a41579c9972ff8004d1aea7d0c7cffaebf246ee28be964d605ad9d52bb96c26d8dc5fa4e225c1998 + languageName: node + linkType: hard + +"fast-levenshtein@npm:^2.0.6": + version: 2.0.6 + resolution: "fast-levenshtein@npm:2.0.6" + checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4 + languageName: node + linkType: hard + +"fast-querystring@npm:^1.0.0": + version: 1.1.2 + resolution: "fast-querystring@npm:1.1.2" + dependencies: + fast-decode-uri-component: "npm:^1.0.1" + checksum: 10c0/e8223273a9b199722f760f5a047a77ad049a14bd444b821502cb8218f5925e3a5fffb56b64389bca73ab2ac6f1aa7aebbe4e203e5f6e53ff5978de97c0fde4e3 + languageName: node + linkType: hard + +"fast-redact@npm:^3.1.1": + version: 3.5.0 + resolution: "fast-redact@npm:3.5.0" + checksum: 10c0/7e2ce4aad6e7535e0775bf12bd3e4f2e53d8051d8b630e0fa9e67f68cb0b0e6070d2f7a94b1d0522ef07e32f7c7cda5755e2b677a6538f1e9070ca053c42343a + languageName: node + linkType: hard + +"fast-uri@npm:^2.3.0": + version: 2.4.0 + resolution: "fast-uri@npm:2.4.0" + checksum: 10c0/300453cfe2f7d5ec16be0f2c8dc5b280edbaca59440b2deb4ab56ac0f584637179e9ee7539d0b70ef0fce9608245ebfa75307c84fa4829b1065c3b7ef7dcf706 + languageName: node + linkType: hard + +"fast-uri@npm:^3.0.0, fast-uri@npm:^3.0.1": + version: 3.0.1 + resolution: "fast-uri@npm:3.0.1" + checksum: 10c0/3cd46d6006083b14ca61ffe9a05b8eef75ef87e9574b6f68f2e17ecf4daa7aaadeff44e3f0f7a0ef4e0f7e7c20fc07beec49ff14dc72d0b500f00386592f2d10 + languageName: node + linkType: hard + +"fastify@npm:^5.0.0": + version: 5.0.0 + resolution: "fastify@npm:5.0.0" + dependencies: + "@fastify/ajv-compiler": "npm:^4.0.0" + "@fastify/error": "npm:^4.0.0" + "@fastify/fast-json-stringify-compiler": "npm:^5.0.0" + abstract-logging: "npm:^2.0.1" + avvio: "npm:^9.0.0" + fast-json-stringify: "npm:^6.0.0" + find-my-way: "npm:^9.0.0" + light-my-request: "npm:^6.0.0" + pino: "npm:^9.0.0" + process-warning: "npm:^4.0.0" + proxy-addr: "npm:^2.0.7" + rfdc: "npm:^1.3.1" + secure-json-parse: "npm:^2.7.0" + semver: "npm:^7.6.0" + toad-cache: "npm:^3.7.0" + checksum: 10c0/566e0948f7fd40c74e847d8bdcd320abd9d086e82020fd1fdd6a95f5b8bdf8d8c793873f6232893361afebe6e62d1687218860097cc3c502c403b15f93f3ce07 + languageName: node + linkType: hard + +"fastq@npm:^1.15.0, fastq@npm:^1.17.1, fastq@npm:^1.6.0": + version: 1.17.1 + resolution: "fastq@npm:1.17.1" + dependencies: + reusify: "npm:^1.0.4" + checksum: 10c0/1095f16cea45fb3beff558bb3afa74ca7a9250f5a670b65db7ed585f92b4b48381445cd328b3d87323da81e43232b5d5978a8201bde84e0cd514310f1ea6da34 + languageName: node + linkType: hard + +"fecha@npm:^4.2.0": + version: 4.2.3 + resolution: "fecha@npm:4.2.3" + checksum: 10c0/0e895965959cf6a22bb7b00f0bf546f2783836310f510ddf63f463e1518d4c96dec61ab33fdfd8e79a71b4856a7c865478ce2ee8498d560fe125947703c9b1cf + languageName: node + linkType: hard + +"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4": + version: 3.2.0 + resolution: "fetch-blob@npm:3.2.0" + dependencies: + node-domexception: "npm:^1.0.0" + web-streams-polyfill: "npm:^3.0.3" + checksum: 10c0/60054bf47bfa10fb0ba6cb7742acec2f37c1f56344f79a70bb8b1c48d77675927c720ff3191fa546410a0442c998d27ab05e9144c32d530d8a52fbe68f843b69 + languageName: node + linkType: hard + +"file-entry-cache@npm:^8.0.0": + version: 8.0.0 + resolution: "file-entry-cache@npm:8.0.0" + dependencies: + flat-cache: "npm:^4.0.0" + checksum: 10c0/9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638 + languageName: node + linkType: hard + +"file-type@npm:^18.0.0": + version: 18.7.0 + resolution: "file-type@npm:18.7.0" + dependencies: + readable-web-to-node-stream: "npm:^3.0.2" + strtok3: "npm:^7.0.0" + token-types: "npm:^5.0.1" + checksum: 10c0/bd06a5a5b2ba13892e8690f01eaacdad1136e0cd8fcc92a2c558a76c0192e8b95e7dddebd3c996f1124ca009ec2f7562537682f361df519e4a369b55b40926a7 + languageName: node + linkType: hard + +"fill-range@npm:^7.1.1": + version: 7.1.1 + resolution: "fill-range@npm:7.1.1" + dependencies: + to-regex-range: "npm:^5.0.1" + checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018 + languageName: node + linkType: hard + +"find-my-way@npm:^9.0.0": + version: 9.0.1 + resolution: "find-my-way@npm:9.0.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + fast-querystring: "npm:^1.0.0" + safe-regex2: "npm:^4.0.0" + checksum: 10c0/77774d1ece5bd7b0bfe8272a50d6a13e6ee2e756af6707ba76346107b918eb0904148db557f9a3bc7e164e2c1e2743a08a021bac488c08f6cbebee1e8b2a4d0f + languageName: node + linkType: hard + +"find-up@npm:^5.0.0": + version: 5.0.0 + resolution: "find-up@npm:5.0.0" + dependencies: + locate-path: "npm:^6.0.0" + path-exists: "npm:^4.0.0" + checksum: 10c0/062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a + languageName: node + linkType: hard + +"find-up@npm:^7.0.0": + version: 7.0.0 + resolution: "find-up@npm:7.0.0" + dependencies: + locate-path: "npm:^7.2.0" + path-exists: "npm:^5.0.0" + unicorn-magic: "npm:^0.1.0" + checksum: 10c0/e6ee3e6154560bc0ab3bc3b7d1348b31513f9bdf49a5dd2e952495427d559fa48cdf33953e85a309a323898b43fa1bfbc8b80c880dfc16068384783034030008 + 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: 10c0/2c59d93e9faa2523e4fda6b4ada749bed432cfa28c8e251f33b25795e426a1c6dbada777afb1f74fcfff33934fdbdea921ee738fcc33e71adc9d6eca984a1cfc + languageName: node + linkType: hard + +"flatted@npm:^3.2.9": + version: 3.3.1 + resolution: "flatted@npm:3.3.1" + checksum: 10c0/324166b125ee07d4ca9bcf3a5f98d915d5db4f39d711fba640a3178b959919aae1f7cfd8aabcfef5826ed8aa8a2aa14cc85b2d7d18ff638ddf4ae3df39573eaf + languageName: node + linkType: hard + +"fn.name@npm:1.x.x": + version: 1.1.0 + resolution: "fn.name@npm:1.1.0" + checksum: 10c0/8ad62aa2d4f0b2a76d09dba36cfec61c540c13a0fd72e5d94164e430f987a7ce6a743112bbeb14877c810ef500d1f73d7f56e76d029d2e3413f20d79e3460a9a + languageName: node + linkType: hard + +"foreground-child@npm:^3.1.0": + version: 3.3.0 + resolution: "foreground-child@npm:3.3.0" + dependencies: + cross-spawn: "npm:^7.0.0" + signal-exit: "npm:^4.0.1" + checksum: 10c0/028f1d41000553fcfa6c4bb5c372963bf3d9bf0b1f25a87d1a6253014343fb69dfb1b42d9625d7cf44c8ba429940f3d0ff718b62105d4d4a4f6ef8ca0a53faa2 + languageName: node + linkType: hard + +"form-data@npm:^4.0.0": + version: 4.0.0 + resolution: "form-data@npm:4.0.0" + dependencies: + asynckit: "npm:^0.4.0" + combined-stream: "npm:^1.0.8" + mime-types: "npm:^2.1.12" + checksum: 10c0/cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e + languageName: node + linkType: hard + +"formdata-polyfill@npm:^4.0.10": + version: 4.0.10 + resolution: "formdata-polyfill@npm:4.0.10" + dependencies: + fetch-blob: "npm:^3.1.2" + checksum: 10c0/5392ec484f9ce0d5e0d52fb5a78e7486637d516179b0eb84d81389d7eccf9ca2f663079da56f761355c0a65792810e3b345dc24db9a8bbbcf24ef3c8c88570c6 + languageName: node + linkType: hard + +"forwarded@npm:0.2.0": + version: 0.2.0 + resolution: "forwarded@npm:0.2.0" + checksum: 10c0/9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33 + languageName: node + linkType: hard + +"fs-minipass@npm:^2.0.0": + version: 2.1.0 + resolution: "fs-minipass@npm:2.1.0" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004 + languageName: node + linkType: hard + +"fs-minipass@npm:^3.0.0": + version: 3.0.3 + resolution: "fs-minipass@npm:3.0.3" + dependencies: + minipass: "npm:^7.0.3" + checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94 + languageName: node + linkType: hard + +"fs.realpath@npm:^1.0.0": + version: 1.0.0 + resolution: "fs.realpath@npm:1.0.0" + checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948 + languageName: node + linkType: hard + +"fsevents@npm:2.3.3, fsevents@npm:~2.3.2": + version: 2.3.3 + resolution: "fsevents@npm:2.3.3" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60 + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": + version: 2.3.3 + resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" + dependencies: + node-gyp: "npm:latest" + conditions: os=darwin + languageName: node + linkType: hard + +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5 + languageName: node + linkType: hard + +"gauge@npm:^3.0.0": + version: 3.0.2 + resolution: "gauge@npm:3.0.2" + dependencies: + aproba: "npm:^1.0.3 || ^2.0.0" + color-support: "npm:^1.1.2" + console-control-strings: "npm:^1.0.0" + has-unicode: "npm:^2.0.1" + object-assign: "npm:^4.1.1" + signal-exit: "npm:^3.0.0" + string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" + wide-align: "npm:^1.1.2" + checksum: 10c0/75230ccaf216471e31025c7d5fcea1629596ca20792de50c596eb18ffb14d8404f927cd55535aab2eeecd18d1e11bd6f23ec3c2e9878d2dda1dc74bccc34b913 + languageName: node + linkType: hard + +"get-port-please@npm:^3.1.2": + version: 3.1.2 + resolution: "get-port-please@npm:3.1.2" + checksum: 10c0/61237342fe035967e5ad1b67a2dee347a64de093bf1222b7cd50072568d73c48dad5cc5cd4fa44635b7cfdcd14d6c47554edb9891c2ec70ab33ecb831683e257 + languageName: node + linkType: hard + +"get-tsconfig@npm:^4.7.3": + version: 4.8.1 + resolution: "get-tsconfig@npm:4.8.1" + dependencies: + resolve-pkg-maps: "npm:^1.0.0" + checksum: 10c0/536ee85d202f604f4b5fb6be81bcd6e6d9a96846811e83e9acc6de4a04fb49506edea0e1b8cf1d5ee7af33e469916ec2809d4c5445ab8ae015a7a51fbd1572f9 + languageName: node + linkType: hard + +"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": + version: 5.1.2 + resolution: "glob-parent@npm:5.1.2" + dependencies: + is-glob: "npm:^4.0.1" + checksum: 10c0/cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee + languageName: node + linkType: hard + +"glob-parent@npm:^6.0.2": + version: 6.0.2 + resolution: "glob-parent@npm:6.0.2" + dependencies: + is-glob: "npm:^4.0.3" + checksum: 10c0/317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8 + languageName: node + linkType: hard + +"glob@npm:^10.2.2, glob@npm:^10.3.10": + version: 10.4.5 + resolution: "glob@npm:10.4.5" + dependencies: + foreground-child: "npm:^3.1.0" + jackspeak: "npm:^3.1.2" + minimatch: "npm:^9.0.4" + minipass: "npm:^7.1.2" + package-json-from-dist: "npm:^1.0.0" + path-scurry: "npm:^1.11.1" + bin: + glob: dist/esm/bin.mjs + checksum: 10c0/19a9759ea77b8e3ca0a43c2f07ecddc2ad46216b786bb8f993c445aee80d345925a21e5280c7b7c6c59e860a0154b84e4b2b60321fea92cd3c56b4a7489f160e + languageName: node + linkType: hard + +"glob@npm:^7.1.3": + version: 7.2.3 + resolution: "glob@npm:7.2.3" + dependencies: + fs.realpath: "npm:^1.0.0" + inflight: "npm:^1.0.4" + inherits: "npm:2" + minimatch: "npm:^3.1.1" + once: "npm:^1.3.0" + path-is-absolute: "npm:^1.0.0" + checksum: 10c0/65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe + languageName: node + linkType: hard + +"globals@npm:^14.0.0": + version: 14.0.0 + resolution: "globals@npm:14.0.0" + checksum: 10c0/b96ff42620c9231ad468d4c58ff42afee7777ee1c963013ff8aabe095a451d0ceeb8dcd8ef4cbd64d2538cef45f787a78ba3a9574f4a634438963e334471302d + languageName: node + linkType: hard + +"globby@npm:^13.1.2": + version: 13.2.2 + resolution: "globby@npm:13.2.2" + dependencies: + dir-glob: "npm:^3.0.1" + fast-glob: "npm:^3.3.0" + ignore: "npm:^5.2.4" + merge2: "npm:^1.4.1" + slash: "npm:^4.0.0" + checksum: 10c0/a8d7cc7cbe5e1b2d0f81d467bbc5bc2eac35f74eaded3a6c85fc26d7acc8e6de22d396159db8a2fc340b8a342e74cac58de8f4aee74146d3d146921a76062664 + languageName: node + linkType: hard + +"graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.6": + version: 4.2.11 + resolution: "graceful-fs@npm:4.2.11" + checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 + languageName: node + linkType: hard + +"graphemer@npm:^1.4.0": + version: 1.4.0 + resolution: "graphemer@npm:1.4.0" + checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31 + languageName: node + linkType: hard + +"h3@npm:^1.12.0": + version: 1.12.0 + resolution: "h3@npm:1.12.0" + dependencies: + cookie-es: "npm:^1.1.0" + crossws: "npm:^0.2.4" + defu: "npm:^6.1.4" + destr: "npm:^2.0.3" + iron-webcrypto: "npm:^1.1.1" + ohash: "npm:^1.1.3" + radix3: "npm:^1.1.2" + ufo: "npm:^1.5.3" + uncrypto: "npm:^0.1.3" + unenv: "npm:^1.9.0" + checksum: 10c0/21ac3ee2451e96a74d6a4ec3a6e589c4725590dc4e675816436ae9d041556fc1b64052ba3775a48912f4ae98977031e1be4c57ac8a80bb4297117506b6ec7a6f + languageName: node + linkType: hard + +"hard-rejection@npm:^2.1.0": + version: 2.1.0 + resolution: "hard-rejection@npm:2.1.0" + checksum: 10c0/febc3343a1ad575aedcc112580835b44a89a89e01f400b4eda6e8110869edfdab0b00cd1bd4c3bfec9475a57e79e0b355aecd5be46454b6a62b9a359af60e564 + languageName: node + linkType: hard + +"has-flag@npm:^3.0.0": + version: 3.0.0 + resolution: "has-flag@npm:3.0.0" + checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473 + languageName: node + linkType: hard + +"has-flag@npm:^4.0.0": + version: 4.0.0 + resolution: "has-flag@npm:4.0.0" + checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1 + languageName: node + linkType: hard + +"has-unicode@npm:^2.0.1": + version: 2.0.1 + resolution: "has-unicode@npm:2.0.1" + checksum: 10c0/ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c + languageName: node + linkType: hard + +"hasown@npm:^2.0.2": + version: 2.0.2 + resolution: "hasown@npm:2.0.2" + dependencies: + function-bind: "npm:^1.1.2" + checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9 + languageName: node + linkType: hard + +"hosted-git-info@npm:^4.0.1": + version: 4.1.0 + resolution: "hosted-git-info@npm:4.1.0" + dependencies: + lru-cache: "npm:^6.0.0" + checksum: 10c0/150fbcb001600336d17fdbae803264abed013548eea7946c2264c49ebe2ebd8c4441ba71dd23dd8e18c65de79d637f98b22d4760ba5fb2e0b15d62543d0fff07 + languageName: node + linkType: hard + +"http-cache-semantics@npm:^4.1.1": + version: 4.1.1 + resolution: "http-cache-semantics@npm:4.1.1" + checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc + languageName: node + linkType: hard + +"http-proxy-agent@npm:^7.0.0": + version: 7.0.2 + resolution: "http-proxy-agent@npm:7.0.2" + dependencies: + agent-base: "npm:^7.1.0" + debug: "npm:^4.3.4" + checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921 + languageName: node + linkType: hard + +"https-proxy-agent@npm:^5.0.0": + version: 5.0.1 + resolution: "https-proxy-agent@npm:5.0.1" + dependencies: + agent-base: "npm:6" + debug: "npm:4" + checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1 + languageName: node + linkType: hard + +"https-proxy-agent@npm:^7.0.1": + version: 7.0.5 + resolution: "https-proxy-agent@npm:7.0.5" + dependencies: + agent-base: "npm:^7.0.2" + debug: "npm:4" + checksum: 10c0/2490e3acec397abeb88807db52cac59102d5ed758feee6df6112ab3ccd8325e8a1ce8bce6f4b66e5470eca102d31e425ace904242e4fa28dbe0c59c4bafa7b2c + languageName: node + linkType: hard + +"iconv-lite@npm:^0.6.2": + version: 0.6.3 + resolution: "iconv-lite@npm:0.6.3" + dependencies: + safer-buffer: "npm:>= 2.1.2 < 3.0.0" + checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1 + languageName: node + linkType: hard + +"ieee754@npm:^1.2.1": + version: 1.2.1 + resolution: "ieee754@npm:1.2.1" + checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb + languageName: node + linkType: hard + +"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1": + version: 5.3.2 + resolution: "ignore@npm:5.3.2" + checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337 + languageName: node + linkType: hard + +"import-fresh@npm:^3.2.1": + version: 3.3.0 + resolution: "import-fresh@npm:3.3.0" + dependencies: + parent-module: "npm:^1.0.0" + resolve-from: "npm:^4.0.0" + checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3 + languageName: node + linkType: hard + +"imurmurhash@npm:^0.1.4": + version: 0.1.4 + resolution: "imurmurhash@npm:0.1.4" + checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6 + languageName: node + linkType: hard + +"indent-string@npm:^4.0.0": + version: 4.0.0 + resolution: "indent-string@npm:4.0.0" + checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f + languageName: node + linkType: hard + +"indent-string@npm:^5.0.0": + version: 5.0.0 + resolution: "indent-string@npm:5.0.0" + checksum: 10c0/8ee77b57d92e71745e133f6f444d6fa3ed503ad0e1bcd7e80c8da08b42375c07117128d670589725ed07b1978065803fa86318c309ba45415b7fe13e7f170220 + languageName: node + linkType: hard + +"inflight@npm:^1.0.4": + version: 1.0.6 + resolution: "inflight@npm:1.0.6" + dependencies: + once: "npm:^1.3.0" + wrappy: "npm:1" + checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2 + languageName: node + linkType: hard + +"inherits@npm:2, inherits@npm:^2.0.3": + version: 2.0.4 + resolution: "inherits@npm:2.0.4" + checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 + languageName: node + linkType: hard + +"ip-address@npm:^9.0.5": + version: 9.0.5 + resolution: "ip-address@npm:9.0.5" + dependencies: + jsbn: "npm:1.1.0" + sprintf-js: "npm:^1.1.3" + checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc + languageName: node + linkType: hard + +"ipaddr.js@npm:1.9.1": + version: 1.9.1 + resolution: "ipaddr.js@npm:1.9.1" + checksum: 10c0/0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a + languageName: node + linkType: hard + +"iron-webcrypto@npm:^1.1.1": + version: 1.2.1 + resolution: "iron-webcrypto@npm:1.2.1" + checksum: 10c0/5cf27c6e2bd3ef3b4970e486235fd82491ab8229e2ed0ac23307c28d6c80d721772a86ed4e9fe2a5cabadd710c2f024b706843b40561fb83f15afee58f809f66 + languageName: node + linkType: hard + +"is-arrayish@npm:^0.2.1": + version: 0.2.1 + resolution: "is-arrayish@npm:0.2.1" + checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729 + languageName: node + linkType: hard + +"is-arrayish@npm:^0.3.1": + version: 0.3.2 + resolution: "is-arrayish@npm:0.3.2" + checksum: 10c0/f59b43dc1d129edb6f0e282595e56477f98c40278a2acdc8b0a5c57097c9eff8fe55470493df5775478cf32a4dc8eaf6d3a749f07ceee5bc263a78b2434f6a54 + languageName: node + linkType: hard + +"is-binary-path@npm:~2.1.0": + version: 2.1.0 + resolution: "is-binary-path@npm:2.1.0" + dependencies: + binary-extensions: "npm:^2.0.0" + checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38 + languageName: node + linkType: hard + +"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0": + version: 2.15.1 + resolution: "is-core-module@npm:2.15.1" + dependencies: + hasown: "npm:^2.0.2" + checksum: 10c0/53432f10c69c40bfd2fa8914133a68709ff9498c86c3bf5fca3cdf3145a56fd2168cbf4a43b29843a6202a120a5f9c5ffba0a4322e1e3441739bc0b641682612 + languageName: node + linkType: hard + +"is-docker@npm:^3.0.0": + version: 3.0.0 + resolution: "is-docker@npm:3.0.0" + bin: + is-docker: cli.js + checksum: 10c0/d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856 + languageName: node + linkType: hard + +"is-extglob@npm:^2.1.1": + version: 2.1.1 + resolution: "is-extglob@npm:2.1.1" + checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912 + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^3.0.0": + version: 3.0.0 + resolution: "is-fullwidth-code-point@npm:3.0.0" + checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc + languageName: node + linkType: hard + +"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": + version: 4.0.3 + resolution: "is-glob@npm:4.0.3" + dependencies: + is-extglob: "npm:^2.1.1" + checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a + languageName: node + linkType: hard + +"is-inside-container@npm:^1.0.0": + version: 1.0.0 + resolution: "is-inside-container@npm:1.0.0" + dependencies: + is-docker: "npm:^3.0.0" + bin: + is-inside-container: cli.js + checksum: 10c0/a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd + languageName: node + linkType: hard + +"is-lambda@npm:^1.0.1": + version: 1.0.1 + resolution: "is-lambda@npm:1.0.1" + checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d + languageName: node + linkType: hard + +"is-number@npm:^7.0.0": + version: 7.0.0 + resolution: "is-number@npm:7.0.0" + checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811 + languageName: node + linkType: hard + +"is-path-cwd@npm:^3.0.0": + version: 3.0.0 + resolution: "is-path-cwd@npm:3.0.0" + checksum: 10c0/8135b789c74e137501ca33b11a846c32d160c517037c0ce390004a98335e010b9712792d97c73d9e98a5ecbcfd03589a81e95c72e1c05014a69fead963a02753 + languageName: node + linkType: hard + +"is-path-inside@npm:^3.0.3": + version: 3.0.3 + resolution: "is-path-inside@npm:3.0.3" + checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05 + languageName: node + linkType: hard + +"is-path-inside@npm:^4.0.0": + version: 4.0.0 + resolution: "is-path-inside@npm:4.0.0" + checksum: 10c0/51188d7e2b1d907a9a5f7c18d99a90b60870b951ed87cf97595d9aaa429d4c010652c3350bcbf31182e7f4b0eab9a1860b43e16729b13cb1a44baaa6cdb64c46 + languageName: node + linkType: hard + +"is-plain-obj@npm:^1.1.0": + version: 1.1.0 + resolution: "is-plain-obj@npm:1.1.0" + checksum: 10c0/daaee1805add26f781b413fdf192fc91d52409583be30ace35c82607d440da63cc4cac0ac55136716688d6c0a2c6ef3edb2254fecbd1fe06056d6bd15975ee8c + languageName: node + linkType: hard + +"is-stream@npm:^2.0.0": + version: 2.0.1 + resolution: "is-stream@npm:2.0.1" + checksum: 10c0/7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5 + languageName: node + linkType: hard + +"is-wsl@npm:^3.1.0": + version: 3.1.0 + resolution: "is-wsl@npm:3.1.0" + dependencies: + is-inside-container: "npm:^1.0.0" + checksum: 10c0/d3317c11995690a32c362100225e22ba793678fe8732660c6de511ae71a0ff05b06980cf21f98a6bf40d7be0e9e9506f859abe00a1118287d63e53d0a3d06947 + languageName: node + linkType: hard + +"isexe@npm:^2.0.0": + version: 2.0.0 + resolution: "isexe@npm:2.0.0" + checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d + languageName: node + linkType: hard + +"isexe@npm:^3.1.1": + version: 3.1.1 + resolution: "isexe@npm:3.1.1" + checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7 + languageName: node + linkType: hard + +"jackspeak@npm:^3.1.2": + version: 3.4.3 + resolution: "jackspeak@npm:3.4.3" + dependencies: + "@isaacs/cliui": "npm:^8.0.2" + "@pkgjs/parseargs": "npm:^0.11.0" + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 10c0/6acc10d139eaefdbe04d2f679e6191b3abf073f111edf10b1de5302c97ec93fffeb2fdd8681ed17f16268aa9dd4f8c588ed9d1d3bffbbfa6e8bf897cbb3149b9 + languageName: node + linkType: hard + +"js-md5@npm:^0.7.3": + version: 0.7.3 + resolution: "js-md5@npm:0.7.3" + checksum: 10c0/3e7048590c40edb0b8fb290e13a81d6eebbd682c70c520c4853820ae8fe3a3c5e375cfa0ca9a731aa8d8e0ba82cd8f922fea34c737caf72a7f9ab819bb8382a7 + languageName: node + linkType: hard + +"js-sha1@npm:^0.6.0": + version: 0.6.0 + resolution: "js-sha1@npm:0.6.0" + checksum: 10c0/9b4e04663a042f2edc9888b857135e0be56a702a9741f39cd316204b65feb782e484069ee7c9d61a2cfa1169d9c926f179f87fdda21b06baf54df1feae56734e + languageName: node + linkType: hard + +"js-tokens@npm:^4.0.0": + version: 4.0.0 + resolution: "js-tokens@npm:4.0.0" + checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed + languageName: node + linkType: hard + +"js-yaml@npm:^4.1.0": + version: 4.1.0 + resolution: "js-yaml@npm:4.1.0" + dependencies: + argparse: "npm:^2.0.1" + bin: + js-yaml: bin/js-yaml.js + checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f + languageName: node + linkType: hard + +"jsbn@npm:1.1.0": + version: 1.1.0 + resolution: "jsbn@npm:1.1.0" + checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96 + languageName: node + linkType: hard + +"json-buffer@npm:3.0.1": + version: 3.0.1 + resolution: "json-buffer@npm:3.0.1" + checksum: 10c0/0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7 + languageName: node + linkType: hard + +"json-parse-even-better-errors@npm:^2.3.0": + version: 2.3.1 + resolution: "json-parse-even-better-errors@npm:2.3.1" + checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3 + languageName: node + linkType: hard + +"json-schema-ref-resolver@npm:^1.0.1": + version: 1.0.1 + resolution: "json-schema-ref-resolver@npm:1.0.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + checksum: 10c0/aa89d88108c0109ae35b913c89c132fb50c00f3b99fc8a8309b524b9e3a6a77414f19a6a35a1253871462984cbabc74279ebbd9bf103c6629fb7b37c9fb59bcf + languageName: node + linkType: hard + +"json-schema-traverse@npm:^0.4.1": + version: 0.4.1 + resolution: "json-schema-traverse@npm:0.4.1" + checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce + languageName: node + linkType: hard + +"json-schema-traverse@npm:^1.0.0": + version: 1.0.0 + resolution: "json-schema-traverse@npm:1.0.0" + checksum: 10c0/71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6 + languageName: node + linkType: hard + +"json-stable-stringify-without-jsonify@npm:^1.0.1": + version: 1.0.1 + resolution: "json-stable-stringify-without-jsonify@npm:1.0.1" + checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5 + 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: 10c0/aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e + languageName: node + linkType: hard + +"kind-of@npm:^6.0.3": + version: 6.0.3 + resolution: "kind-of@npm:6.0.3" + checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4 + languageName: node + linkType: hard + +"kuler@npm:^2.0.0": + version: 2.0.0 + resolution: "kuler@npm:2.0.0" + checksum: 10c0/0a4e99d92ca373f8f74d1dc37931909c4d0d82aebc94cf2ba265771160fc12c8df34eaaac80805efbda367e2795cb1f1dd4c3d404b6b1cf38aec94035b503d2d + languageName: node + linkType: hard + +"levn@npm:^0.4.1": + version: 0.4.1 + resolution: "levn@npm:0.4.1" + dependencies: + prelude-ls: "npm:^1.2.1" + type-check: "npm:~0.4.0" + checksum: 10c0/effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e + languageName: node + linkType: hard + +"light-my-request@npm:^6.0.0": + version: 6.0.0 + resolution: "light-my-request@npm:6.0.0" + dependencies: + cookie: "npm:^0.6.0" + process-warning: "npm:^4.0.0" + set-cookie-parser: "npm:^2.6.0" + checksum: 10c0/521fde58b0e52d05cc38b23a7ef5b9b7ce35b9a943a4e5a27eb219de2ac08ff566bfaa194b8db3bf99cf0800adc5fe5ed9c0c604c18fce8a0d4554e2237ee89b + languageName: node + linkType: hard + +"lines-and-columns@npm:^1.1.6": + version: 1.2.4 + resolution: "lines-and-columns@npm:1.2.4" + checksum: 10c0/3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d + languageName: node + linkType: hard + +"load-tsconfig@npm:^0.2.3": + version: 0.2.5 + resolution: "load-tsconfig@npm:0.2.5" + checksum: 10c0/bf2823dd26389d3497b6567f07435c5a7a58d9df82e879b0b3892f87d8db26900f84c85bc329ef41c0540c0d6a448d1c23ddc64a80f3ff6838b940f3915a3fcb + languageName: node + linkType: hard + +"locate-path@npm:^6.0.0": + version: 6.0.0 + resolution: "locate-path@npm:6.0.0" + dependencies: + p-locate: "npm:^5.0.0" + checksum: 10c0/d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3 + languageName: node + linkType: hard + +"locate-path@npm:^7.2.0": + version: 7.2.0 + resolution: "locate-path@npm:7.2.0" + dependencies: + p-locate: "npm:^6.0.0" + checksum: 10c0/139e8a7fe11cfbd7f20db03923cacfa5db9e14fa14887ea121345597472b4a63c1a42a8a5187defeeff6acf98fd568da7382aa39682d38f0af27433953a97751 + languageName: node + linkType: hard + +"lodash.merge@npm:^4.6.2": + version: 4.6.2 + resolution: "lodash.merge@npm:4.6.2" + checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506 + languageName: node + linkType: hard + +"lodash@npm:^4.17.21": + version: 4.17.21 + resolution: "lodash@npm:4.17.21" + checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c + languageName: node + linkType: hard + +"logform@npm:^2.6.0, logform@npm:^2.6.1": + version: 2.6.1 + resolution: "logform@npm:2.6.1" + dependencies: + "@colors/colors": "npm:1.6.0" + "@types/triple-beam": "npm:^1.3.2" + fecha: "npm:^4.2.0" + ms: "npm:^2.1.1" + safe-stable-stringify: "npm:^2.3.1" + triple-beam: "npm:^1.3.0" + checksum: 10c0/c20019336b1da8c08adea67dd7de2b0effdc6e35289c0156722924b571df94ba9f900ef55620c56bceb07cae7cc46057c9859accdee37a131251ba34d6789bce + languageName: node + linkType: hard + +"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": + version: 10.4.3 + resolution: "lru-cache@npm:10.4.3" + checksum: 10c0/ebd04fbca961e6c1d6c0af3799adcc966a1babe798f685bb84e6599266599cd95d94630b10262f5424539bc4640107e8a33aa28585374abf561d30d16f4b39fb + languageName: node + linkType: hard + +"lru-cache@npm:^6.0.0": + version: 6.0.0 + resolution: "lru-cache@npm:6.0.0" + dependencies: + yallist: "npm:^4.0.0" + checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9 + languageName: node + linkType: hard + +"make-dir@npm:^3.1.0": + version: 3.1.0 + resolution: "make-dir@npm:3.1.0" + dependencies: + semver: "npm:^6.0.0" + checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa + languageName: node + linkType: hard + +"make-fetch-happen@npm:^13.0.0": + version: 13.0.1 + resolution: "make-fetch-happen@npm:13.0.1" + dependencies: + "@npmcli/agent": "npm:^2.0.0" + cacache: "npm:^18.0.0" + http-cache-semantics: "npm:^4.1.1" + is-lambda: "npm:^1.0.1" + minipass: "npm:^7.0.2" + minipass-fetch: "npm:^3.0.0" + minipass-flush: "npm:^1.0.5" + minipass-pipeline: "npm:^1.2.4" + negotiator: "npm:^0.6.3" + proc-log: "npm:^4.2.0" + promise-retry: "npm:^2.0.1" + ssri: "npm:^10.0.0" + checksum: 10c0/df5f4dbb6d98153b751bccf4dc4cc500de85a96a9331db9805596c46aa9f99d9555983954e6c1266d9f981ae37a9e4647f42b9a4bb5466f867f4012e582c9e7e + languageName: node + linkType: hard + +"map-obj@npm:^1.0.0": + version: 1.0.1 + resolution: "map-obj@npm:1.0.1" + checksum: 10c0/ccca88395e7d38671ed9f5652ecf471ecd546924be2fb900836b9da35e068a96687d96a5f93dcdfa94d9a27d649d2f10a84595590f89a347fb4dda47629dcc52 + languageName: node + linkType: hard + +"map-obj@npm:^4.1.0": + version: 4.3.0 + resolution: "map-obj@npm:4.3.0" + checksum: 10c0/1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b + languageName: node + linkType: hard + +"meow@npm:^10.1.3": + version: 10.1.5 + resolution: "meow@npm:10.1.5" + dependencies: + "@types/minimist": "npm:^1.2.2" + camelcase-keys: "npm:^7.0.0" + decamelize: "npm:^5.0.0" + decamelize-keys: "npm:^1.1.0" + hard-rejection: "npm:^2.1.0" + minimist-options: "npm:4.1.0" + normalize-package-data: "npm:^3.0.2" + read-pkg-up: "npm:^8.0.0" + redent: "npm:^4.0.0" + trim-newlines: "npm:^4.0.2" + type-fest: "npm:^1.2.2" + yargs-parser: "npm:^20.2.9" + checksum: 10c0/a513849022edd5ddcc41d28c679d31978abe414d9db5bc457e95e537a4327b2910fd2f699cdd883293f9a5da8951a50939bf60fbd62f7fe12b9ddf96a84b1b27 + languageName: node + linkType: hard + +"merge2@npm:^1.3.0, merge2@npm:^1.4.1": + version: 1.4.1 + resolution: "merge2@npm:1.4.1" + checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb + languageName: node + linkType: hard + +"micromatch@npm:^4.0.4": + version: 4.0.8 + resolution: "micromatch@npm:4.0.8" + dependencies: + braces: "npm:^3.0.3" + picomatch: "npm:^2.3.1" + checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8 + languageName: node + linkType: hard + +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa + languageName: node + linkType: hard + +"mime-types@npm:^2.1.12": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" + dependencies: + mime-db: "npm:1.52.0" + checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2 + languageName: node + linkType: hard + +"mime@npm:^3.0.0": + version: 3.0.0 + resolution: "mime@npm:3.0.0" + bin: + mime: cli.js + checksum: 10c0/402e792a8df1b2cc41cb77f0dcc46472b7944b7ec29cb5bbcd398624b6b97096728f1239766d3fdeb20551dd8d94738344c195a6ea10c4f906eb0356323b0531 + languageName: node + linkType: hard + +"mimic-response@npm:^2.0.0": + version: 2.1.0 + resolution: "mimic-response@npm:2.1.0" + checksum: 10c0/717475c840f20deca87a16cb2f7561f9115f5de225ea2377739e09890c81aec72f43c81fd4984650c4044e66be5a846fa7a517ac7908f01009e1e624e19864d5 + languageName: node + linkType: hard + +"min-indent@npm:^1.0.1": + version: 1.0.1 + resolution: "min-indent@npm:1.0.1" + checksum: 10c0/7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c + languageName: node + linkType: hard + +"minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": + version: 3.1.2 + resolution: "minimatch@npm:3.1.2" + dependencies: + brace-expansion: "npm:^1.1.7" + checksum: 10c0/0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311 + languageName: node + linkType: hard + +"minimatch@npm:^9.0.3, minimatch@npm:^9.0.4, minimatch@npm:^9.0.5": + version: 9.0.5 + resolution: "minimatch@npm:9.0.5" + dependencies: + brace-expansion: "npm:^2.0.1" + checksum: 10c0/de96cf5e35bdf0eab3e2c853522f98ffbe9a36c37797778d2665231ec1f20a9447a7e567cb640901f89e4daaa95ae5d70c65a9e8aa2bb0019b6facbc3c0575ed + languageName: node + linkType: hard + +"minimist-options@npm:4.1.0": + version: 4.1.0 + resolution: "minimist-options@npm:4.1.0" + dependencies: + arrify: "npm:^1.0.1" + is-plain-obj: "npm:^1.1.0" + kind-of: "npm:^6.0.3" + checksum: 10c0/7871f9cdd15d1e7374e5b013e2ceda3d327a06a8c7b38ae16d9ef941e07d985e952c589e57213f7aa90a8744c60aed9524c0d85e501f5478382d9181f2763f54 + languageName: node + linkType: hard + +"minipass-collect@npm:^2.0.1": + version: 2.0.1 + resolution: "minipass-collect@npm:2.0.1" + dependencies: + minipass: "npm:^7.0.3" + checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e + languageName: node + linkType: hard + +"minipass-fetch@npm:^3.0.0": + version: 3.0.5 + resolution: "minipass-fetch@npm:3.0.5" + dependencies: + encoding: "npm:^0.1.13" + minipass: "npm:^7.0.3" + minipass-sized: "npm:^1.0.3" + minizlib: "npm:^2.1.2" + dependenciesMeta: + encoding: + optional: true + checksum: 10c0/9d702d57f556274286fdd97e406fc38a2f5c8d15e158b498d7393b1105974b21249289ec571fa2b51e038a4872bfc82710111cf75fae98c662f3d6f95e72152b + languageName: node + linkType: hard + +"minipass-flush@npm:^1.0.5": + version: 1.0.5 + resolution: "minipass-flush@npm:1.0.5" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd + languageName: node + linkType: hard + +"minipass-pipeline@npm:^1.2.4": + version: 1.2.4 + resolution: "minipass-pipeline@npm:1.2.4" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2 + languageName: node + linkType: hard + +"minipass-sized@npm:^1.0.3": + version: 1.0.3 + resolution: "minipass-sized@npm:1.0.3" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb + languageName: node + linkType: hard + +"minipass@npm:^3.0.0": + version: 3.3.6 + resolution: "minipass@npm:3.3.6" + dependencies: + yallist: "npm:^4.0.0" + checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c + languageName: node + linkType: hard + +"minipass@npm:^5.0.0": + version: 5.0.0 + resolution: "minipass@npm:5.0.0" + checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462 + languageName: node + linkType: hard + +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2": + version: 7.1.2 + resolution: "minipass@npm:7.1.2" + checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557 + languageName: node + linkType: hard + +"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": + version: 2.1.2 + resolution: "minizlib@npm:2.1.2" + dependencies: + minipass: "npm:^3.0.0" + yallist: "npm:^4.0.0" + checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78 + languageName: node + linkType: hard + +"mkdirp@npm:^1.0.3": + version: 1.0.4 + resolution: "mkdirp@npm:1.0.4" + bin: + mkdirp: bin/cmd.js + checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf + languageName: node + linkType: hard + +"mlly@npm:^1.7.1": + version: 1.7.1 + resolution: "mlly@npm:1.7.1" + dependencies: + acorn: "npm:^8.11.3" + pathe: "npm:^1.1.2" + pkg-types: "npm:^1.1.1" + ufo: "npm:^1.5.3" + checksum: 10c0/d836a7b0adff4d118af41fb93ad4d9e57f80e694a681185280ba220a4607603c19e86c80f9a6c57512b04280567f2599e3386081705c5b5fd74c9ddfd571d0fa + languageName: node + linkType: hard + +"mrmime@npm:^2.0.0": + version: 2.0.0 + resolution: "mrmime@npm:2.0.0" + checksum: 10c0/312b35ed288986aec90955410b21ed7427fd1e4ee318cb5fc18765c8d029eeded9444faa46589e5b1ed6b35fb2054a802ac8dcb917ddf6b3e189cb3bf11a965c + languageName: node + linkType: hard + +"ms@npm:^2.1.1, ms@npm:^2.1.3": + version: 2.1.3 + resolution: "ms@npm:2.1.3" + checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 + languageName: node + linkType: hard + +"nan@npm:^2.17.0": + version: 2.20.0 + resolution: "nan@npm:2.20.0" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/75775309a21ad179a55250d62ce47322c33ca03d8ddb5ad4c555bd820dd72484b3c59253dd9f41cc68dd63453ef04017407fbd081a549bc030d977079bb798b7 + languageName: node + linkType: hard + +"natural-compare@npm:^1.4.0": + version: 1.4.0 + resolution: "natural-compare@npm:1.4.0" + checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447 + languageName: node + linkType: hard + +"negotiator@npm:^0.6.3": + version: 0.6.3 + resolution: "negotiator@npm:0.6.3" + checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2 + languageName: node + linkType: hard + +"node-domexception@npm:^1.0.0": + version: 1.0.0 + resolution: "node-domexception@npm:1.0.0" + checksum: 10c0/5e5d63cda29856402df9472335af4bb13875e1927ad3be861dc5ebde38917aecbf9ae337923777af52a48c426b70148815e890a5d72760f1b4d758cc671b1a2b + languageName: node + linkType: hard + +"node-fetch-native@npm:^1.6.4": + version: 1.6.4 + resolution: "node-fetch-native@npm:1.6.4" + checksum: 10c0/78334dc6def5d1d95cfe87b33ac76c4833592c5eb84779ad2b0c23c689f9dd5d1cfc827035ada72d6b8b218f717798968c5a99aeff0a1a8bf06657e80592f9c3 + languageName: node + linkType: hard + +"node-fetch@npm:^2.6.7": + version: 2.7.0 + resolution: "node-fetch@npm:2.7.0" + dependencies: + whatwg-url: "npm:^5.0.0" + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + checksum: 10c0/b55786b6028208e6fbe594ccccc213cab67a72899c9234eb59dba51062a299ea853210fcf526998eaa2867b0963ad72338824450905679ff0fa304b8c5093ae8 + languageName: node + linkType: hard + +"node-fetch@npm:^3.3.0": + version: 3.3.2 + resolution: "node-fetch@npm:3.3.2" + dependencies: + data-uri-to-buffer: "npm:^4.0.0" + fetch-blob: "npm:^3.1.4" + formdata-polyfill: "npm:^4.0.10" + checksum: 10c0/f3d5e56190562221398c9f5750198b34cf6113aa304e34ee97c94fd300ec578b25b2c2906edba922050fce983338fde0d5d34fcb0fc3336ade5bd0e429ad7538 + languageName: node + linkType: hard + +"node-gyp@npm:latest": + version: 10.2.0 + resolution: "node-gyp@npm:10.2.0" + dependencies: + env-paths: "npm:^2.2.0" + exponential-backoff: "npm:^3.1.1" + glob: "npm:^10.3.10" + graceful-fs: "npm:^4.2.6" + make-fetch-happen: "npm:^13.0.0" + nopt: "npm:^7.0.0" + proc-log: "npm:^4.1.0" + semver: "npm:^7.3.5" + tar: "npm:^6.2.1" + which: "npm:^4.0.0" + bin: + node-gyp: bin/node-gyp.js + checksum: 10c0/00630d67dbd09a45aee0a5d55c05e3916ca9e6d427ee4f7bc392d2d3dc5fad7449b21fc098dd38260a53d9dcc9c879b36704a1994235d4707e7271af7e9a835b + languageName: node + linkType: hard + +"node-worker-threads-pool@npm:^1.5.1": + version: 1.5.1 + resolution: "node-worker-threads-pool@npm:1.5.1" + checksum: 10c0/1319010a32ef01a3dd611b65535e8e2d82ec7fe90b2e7360de2e53a2bb4ccd245b9d6c0c86bd7f13752ea57a31542be9313284cef573b13b45de09fb351dd6ce + languageName: node + linkType: hard + +"nopt@npm:^5.0.0": + version: 5.0.0 + resolution: "nopt@npm:5.0.0" + dependencies: + abbrev: "npm:1" + bin: + nopt: bin/nopt.js + checksum: 10c0/fc5c4f07155cb455bf5fc3dd149fac421c1a40fd83c6bfe83aa82b52f02c17c5e88301321318adaa27611c8a6811423d51d29deaceab5fa158b585a61a551061 + languageName: node + linkType: hard + +"nopt@npm:^7.0.0": + version: 7.2.1 + resolution: "nopt@npm:7.2.1" + dependencies: + abbrev: "npm:^2.0.0" + bin: + nopt: bin/nopt.js + checksum: 10c0/a069c7c736767121242037a22a788863accfa932ab285a1eb569eb8cd534b09d17206f68c37f096ae785647435e0c5a5a0a67b42ec743e481a455e5ae6a6df81 + languageName: node + linkType: hard + +"normalize-package-data@npm:^3.0.2": + version: 3.0.3 + resolution: "normalize-package-data@npm:3.0.3" + dependencies: + hosted-git-info: "npm:^4.0.1" + is-core-module: "npm:^2.5.0" + semver: "npm:^7.3.4" + validate-npm-package-license: "npm:^3.0.1" + checksum: 10c0/e5d0f739ba2c465d41f77c9d950e291ea4af78f8816ddb91c5da62257c40b76d8c83278b0d08ffbcd0f187636ebddad20e181e924873916d03e6e5ea2ef026be + languageName: node + linkType: hard + +"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": + version: 3.0.0 + resolution: "normalize-path@npm:3.0.0" + checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046 + languageName: node + linkType: hard + +"npmlog@npm:^5.0.1": + version: 5.0.1 + resolution: "npmlog@npm:5.0.1" + dependencies: + are-we-there-yet: "npm:^2.0.0" + console-control-strings: "npm:^1.1.0" + gauge: "npm:^3.0.0" + set-blocking: "npm:^2.0.0" + checksum: 10c0/489ba519031013001135c463406f55491a17fc7da295c18a04937fe3a4d523fd65e88dd418a28b967ab743d913fdeba1e29838ce0ad8c75557057c481f7d49fa + languageName: node + linkType: hard + +"object-assign@npm:^4.1.1": + version: 4.1.1 + resolution: "object-assign@npm:4.1.1" + checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 + languageName: node + linkType: hard + +"ohash@npm:^1.1.3": + version: 1.1.4 + resolution: "ohash@npm:1.1.4" + checksum: 10c0/73c3bcab2891ee2155ed62bb4c2906f622bf2204a3c9f4616ada8a6a76276bb6b4b4180eaf273b7c7d6232793e4d79d486aab436ebfc0d06d92a997f07122864 + languageName: node + linkType: hard + +"on-exit-leak-free@npm:^2.1.0": + version: 2.1.2 + resolution: "on-exit-leak-free@npm:2.1.2" + checksum: 10c0/faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570 + languageName: node + linkType: hard + +"once@npm:^1.3.0, once@npm:^1.3.1": + version: 1.4.0 + resolution: "once@npm:1.4.0" + dependencies: + wrappy: "npm:1" + checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0 + languageName: node + linkType: hard + +"one-time@npm:^1.0.0": + version: 1.0.0 + resolution: "one-time@npm:1.0.0" + dependencies: + fn.name: "npm:1.x.x" + checksum: 10c0/6e4887b331edbb954f4e915831cbec0a7b9956c36f4feb5f6de98c448ac02ff881fd8d9b55a6b1b55030af184c6b648f340a76eb211812f4ad8c9b4b8692fdaa + languageName: node + linkType: hard + +"open@npm:^10.1.0": + version: 10.1.0 + resolution: "open@npm:10.1.0" + dependencies: + default-browser: "npm:^5.2.1" + define-lazy-prop: "npm:^3.0.0" + is-inside-container: "npm:^1.0.0" + is-wsl: "npm:^3.1.0" + checksum: 10c0/c86d0b94503d5f735f674158d5c5d339c25ec2927562f00ee74590727292ed23e1b8d9336cb41ffa7e1fa4d3641d29b199b4ea37c78cb557d72b511743e90ebb + languageName: node + linkType: hard + +"optionator@npm:^0.9.3": + version: 0.9.4 + resolution: "optionator@npm:0.9.4" + dependencies: + deep-is: "npm:^0.1.3" + fast-levenshtein: "npm:^2.0.6" + levn: "npm:^0.4.1" + prelude-ls: "npm:^1.2.1" + type-check: "npm:^0.4.0" + word-wrap: "npm:^1.2.5" + checksum: 10c0/4afb687a059ee65b61df74dfe87d8d6815cd6883cb8b3d5883a910df72d0f5d029821f37025e4bccf4048873dbdb09acc6d303d27b8f76b1a80dd5a7d5334675 + languageName: node + linkType: hard + +"opusscript@npm:^0.0.8": + version: 0.0.8 + resolution: "opusscript@npm:0.0.8" + checksum: 10c0/784215c8c825794d76876a0e130f221ad592afdecef681dd1ff8bafb8b2831b31d7ec5cc93115c827004b7e815bf70ef75aa24fb3cd5de2b11b6bce0537006e2 + languageName: node + linkType: hard + +"p-limit@npm:^3.0.2": + version: 3.1.0 + resolution: "p-limit@npm:3.1.0" + dependencies: + yocto-queue: "npm:^0.1.0" + checksum: 10c0/9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a + languageName: node + linkType: hard + +"p-limit@npm:^4.0.0": + version: 4.0.0 + resolution: "p-limit@npm:4.0.0" + dependencies: + yocto-queue: "npm:^1.0.0" + checksum: 10c0/a56af34a77f8df2ff61ddfb29431044557fcbcb7642d5a3233143ebba805fc7306ac1d448de724352861cb99de934bc9ab74f0d16fe6a5460bdbdf938de875ad + languageName: node + linkType: hard + +"p-locate@npm:^5.0.0": + version: 5.0.0 + resolution: "p-locate@npm:5.0.0" + dependencies: + p-limit: "npm:^3.0.2" + checksum: 10c0/2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a + languageName: node + linkType: hard + +"p-locate@npm:^6.0.0": + version: 6.0.0 + resolution: "p-locate@npm:6.0.0" + dependencies: + p-limit: "npm:^4.0.0" + checksum: 10c0/d72fa2f41adce59c198270aa4d3c832536c87a1806e0f69dffb7c1a7ca998fb053915ca833d90f166a8c082d3859eabfed95f01698a3214c20df6bb8de046312 + languageName: node + linkType: hard + +"p-map@npm:^4.0.0": + version: 4.0.0 + resolution: "p-map@npm:4.0.0" + dependencies: + aggregate-error: "npm:^3.0.0" + checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75 + languageName: node + linkType: hard + +"p-map@npm:^5.5.0": + version: 5.5.0 + resolution: "p-map@npm:5.5.0" + dependencies: + aggregate-error: "npm:^4.0.0" + checksum: 10c0/410bce846b1e3db6bb2ccab6248372ecf4e635fc2b31331c8f56478e73fec9e146e8b4547585e635703160a3d252a6a65b8f855834aebc2c3408eb5789630cc4 + languageName: node + linkType: hard + +"package-json-from-dist@npm:^1.0.0": + version: 1.0.0 + resolution: "package-json-from-dist@npm:1.0.0" + checksum: 10c0/e3ffaf6ac1040ab6082a658230c041ad14e72fabe99076a2081bb1d5d41210f11872403fc09082daf4387fc0baa6577f96c9c0e94c90c394fd57794b66aa4033 + languageName: node + linkType: hard + +"parent-module@npm:^1.0.0": + version: 1.0.1 + resolution: "parent-module@npm:1.0.1" + dependencies: + callsites: "npm:^3.0.0" + checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556 + languageName: node + linkType: hard + +"parse-json@npm:^5.2.0": + version: 5.2.0 + resolution: "parse-json@npm:5.2.0" + dependencies: + "@babel/code-frame": "npm:^7.0.0" + error-ex: "npm:^1.3.1" + json-parse-even-better-errors: "npm:^2.3.0" + lines-and-columns: "npm:^1.1.6" + checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585 + languageName: node + linkType: hard + +"parsimmon@npm:^1.16.0": + version: 1.18.1 + resolution: "parsimmon@npm:1.18.1" + checksum: 10c0/c365759d8f5baeede0d7903fd34499e07d2f9d0a6ce8bfa69096c9d2bf39be75a7e03fc0a6ec4ffcd285e40d76bf2a5c28c1741d97b8f8a049c06723d063ede8 + languageName: node + linkType: hard + +"path-exists@npm:^4.0.0": + version: 4.0.0 + resolution: "path-exists@npm:4.0.0" + checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b + languageName: node + linkType: hard + +"path-exists@npm:^5.0.0": + version: 5.0.0 + resolution: "path-exists@npm:5.0.0" + checksum: 10c0/b170f3060b31604cde93eefdb7392b89d832dfbc1bed717c9718cbe0f230c1669b7e75f87e19901da2250b84d092989a0f9e44d2ef41deb09aa3ad28e691a40a + languageName: node + linkType: hard + +"path-is-absolute@npm:^1.0.0": + version: 1.0.1 + resolution: "path-is-absolute@npm:1.0.1" + checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078 + languageName: node + linkType: hard + +"path-key@npm:^3.1.0": + version: 3.1.1 + resolution: "path-key@npm:3.1.1" + checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c + languageName: node + linkType: hard + +"path-parse@npm:^1.0.7": + version: 1.0.7 + resolution: "path-parse@npm:1.0.7" + checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1 + languageName: node + linkType: hard + +"path-scurry@npm:^1.11.1": + version: 1.11.1 + resolution: "path-scurry@npm:1.11.1" + dependencies: + lru-cache: "npm:^10.2.0" + minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" + checksum: 10c0/32a13711a2a505616ae1cc1b5076801e453e7aae6ac40ab55b388bb91b9d0547a52f5aaceff710ea400205f18691120d4431e520afbe4266b836fadede15872d + languageName: node + linkType: hard + +"path-type@npm:^4.0.0": + version: 4.0.0 + resolution: "path-type@npm:4.0.0" + checksum: 10c0/666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c + languageName: node + linkType: hard + +"pathe@npm:^1.1.2": + version: 1.1.2 + resolution: "pathe@npm:1.1.2" + checksum: 10c0/64ee0a4e587fb0f208d9777a6c56e4f9050039268faaaaecd50e959ef01bf847b7872785c36483fa5cdcdbdfdb31fef2ff222684d4fc21c330ab60395c681897 + languageName: node + linkType: hard + +"pb-text-format-to-json@npm:^1.1.1": + version: 1.1.2 + resolution: "pb-text-format-to-json@npm:1.1.2" + dependencies: + parsimmon: "npm:^1.16.0" + checksum: 10c0/292c8c549db9c796e578fdb67752bd6db0b2ad5faca1dc685607effdc772107b8c2cda9e4b88e66f28fde77e0f10ba4e3cdee46d19c583411c945e1368a7bd08 + languageName: node + linkType: hard + +"peek-readable@npm:^5.1.3": + version: 5.2.0 + resolution: "peek-readable@npm:5.2.0" + checksum: 10c0/7647d56786c94fc7f5f39923ef5f6ed1da7be92a2c221b743db74f1517821b1e944cc965d8f018a7e6984d969b6ced8a0c421aece7996c0b1981eac9daa4c323 + languageName: node + linkType: hard + +"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1": + version: 1.1.0 + resolution: "picocolors@npm:1.1.0" + checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023 + languageName: node + linkType: hard + +"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.3.1": + version: 2.3.1 + resolution: "picomatch@npm:2.3.1" + checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be + languageName: node + linkType: hard + +"picomatch@npm:^4.0.2": + version: 4.0.2 + resolution: "picomatch@npm:4.0.2" + checksum: 10c0/7c51f3ad2bb42c776f49ebf964c644958158be30d0a510efd5a395e8d49cb5acfed5b82c0c5b365523ce18e6ab85013c9ebe574f60305892ec3fa8eee8304ccc + languageName: node + linkType: hard + +"pino-abstract-transport@npm:^1.2.0": + version: 1.2.0 + resolution: "pino-abstract-transport@npm:1.2.0" + dependencies: + readable-stream: "npm:^4.0.0" + split2: "npm:^4.0.0" + checksum: 10c0/b4ab59529b7a91f488440147fc58ee0827a6c1c5ca3627292339354b1381072c1a6bfa9b46d03ad27872589e8477ecf74da12cf286e1e6b665ac64a3b806bf07 + languageName: node + linkType: hard + +"pino-std-serializers@npm:^7.0.0": + version: 7.0.0 + resolution: "pino-std-serializers@npm:7.0.0" + checksum: 10c0/73e694d542e8de94445a03a98396cf383306de41fd75ecc07085d57ed7a57896198508a0dec6eefad8d701044af21eb27253ccc352586a03cf0d4a0bd25b4133 + languageName: node + linkType: hard + +"pino@npm:^9.0.0": + version: 9.4.0 + resolution: "pino@npm:9.4.0" + dependencies: + atomic-sleep: "npm:^1.0.0" + fast-redact: "npm:^3.1.1" + on-exit-leak-free: "npm:^2.1.0" + pino-abstract-transport: "npm:^1.2.0" + pino-std-serializers: "npm:^7.0.0" + process-warning: "npm:^4.0.0" + quick-format-unescaped: "npm:^4.0.3" + real-require: "npm:^0.2.0" + safe-stable-stringify: "npm:^2.3.1" + sonic-boom: "npm:^4.0.1" + thread-stream: "npm:^3.0.0" + bin: + pino: bin.js + checksum: 10c0/12a3d74968964d92b18ca7d6095a3c5b86478dc22264a37486d64e102085ed08820fcbe75e640acc3542fdf2937a34e5050b624f98e6ac62dd10f5e1328058a2 + languageName: node + linkType: hard + +"pkg-types@npm:^1.1.1": + version: 1.2.0 + resolution: "pkg-types@npm:1.2.0" + dependencies: + confbox: "npm:^0.1.7" + mlly: "npm:^1.7.1" + pathe: "npm:^1.1.2" + checksum: 10c0/111cf6ad4235438821ea195a0d70570b1bd36a71d094d258349027c9c304dea8b4f9669c9f7ce813f9a48a02942fb0d7fe9809127dbe7bb4b18a8de71583a081 + languageName: node + linkType: hard + +"prelude-ls@npm:^1.2.1": + version: 1.2.1 + resolution: "prelude-ls@npm:1.2.1" + checksum: 10c0/b00d617431e7886c520a6f498a2e14c75ec58f6d93ba48c3b639cf241b54232d90daa05d83a9e9b9fef6baa63cb7e1e4602c2372fea5bc169668401eb127d0cd + languageName: node + linkType: hard + +"prisma@npm:5.20.0": + version: 5.20.0 + resolution: "prisma@npm:5.20.0" + dependencies: + "@prisma/engines": "npm:5.20.0" + fsevents: "npm:2.3.3" + dependenciesMeta: + fsevents: + optional: true + bin: + prisma: build/index.js + checksum: 10c0/8b4ba34421b0552a055e671cecef53a5f244bf79c7fb767c9493f347a1f24f458ed84cdf78e32e067f67b173d98482edf68df1cd6072d523669cf914b4e376a9 + languageName: node + linkType: hard + +"proc-log@npm:^4.1.0, proc-log@npm:^4.2.0": + version: 4.2.0 + resolution: "proc-log@npm:4.2.0" + checksum: 10c0/17db4757c2a5c44c1e545170e6c70a26f7de58feb985091fb1763f5081cab3d01b181fb2dd240c9f4a4255a1d9227d163d5771b7e69c9e49a561692db865efb9 + languageName: node + linkType: hard + +"process-warning@npm:^4.0.0": + version: 4.0.0 + resolution: "process-warning@npm:4.0.0" + checksum: 10c0/5312a72b69d37a1b82ad03f3dfa0090dab3804a8fd995d06c28e3c002852bd82f5584217d9f4a3f197892bb2afc22d57e2c662c7e906b5abb48c0380c7b0880d + languageName: node + linkType: hard + +"process@npm:^0.11.10": + version: 0.11.10 + resolution: "process@npm:0.11.10" + checksum: 10c0/40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3 + languageName: node + linkType: hard + +"promise-retry@npm:^2.0.1": + version: 2.0.1 + resolution: "promise-retry@npm:2.0.1" + dependencies: + err-code: "npm:^2.0.2" + retry: "npm:^0.12.0" + checksum: 10c0/9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96 + languageName: node + linkType: hard + +"proxy-addr@npm:^2.0.7": + version: 2.0.7 + resolution: "proxy-addr@npm:2.0.7" + dependencies: + forwarded: "npm:0.2.0" + ipaddr.js: "npm:1.9.1" + checksum: 10c0/c3eed999781a35f7fd935f398b6d8920b6fb00bbc14287bc6de78128ccc1a02c89b95b56742bf7cf0362cc333c61d138532049c7dedc7a328ef13343eff81210 + languageName: node + linkType: hard + +"punycode@npm:^2.1.0": + version: 2.3.1 + resolution: "punycode@npm:2.3.1" + checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9 + languageName: node + linkType: hard + +"queue-microtask@npm:^1.2.2": + version: 1.2.3 + resolution: "queue-microtask@npm:1.2.3" + checksum: 10c0/900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102 + languageName: node + linkType: hard + +"quick-format-unescaped@npm:^4.0.3": + version: 4.0.4 + resolution: "quick-format-unescaped@npm:4.0.4" + checksum: 10c0/fe5acc6f775b172ca5b4373df26f7e4fd347975578199e7d74b2ae4077f0af05baa27d231de1e80e8f72d88275ccc6028568a7a8c9ee5e7368ace0e18eff93a4 + languageName: node + linkType: hard + +"quick-lru@npm:^5.1.1": + version: 5.1.1 + resolution: "quick-lru@npm:5.1.1" + checksum: 10c0/a24cba5da8cec30d70d2484be37622580f64765fb6390a928b17f60cd69e8dbd32a954b3ff9176fa1b86d86ff2ba05252fae55dc4d40d0291c60412b0ad096da + languageName: node + linkType: hard + +"radix3@npm:^1.1.2": + version: 1.1.2 + resolution: "radix3@npm:1.1.2" + checksum: 10c0/d4a295547f71af079868d2c2ed3814a9296ee026c5488212d58c106e6b4797c6eaec1259b46c9728913622f2240c9a944bfc8e2b3b5f6e4a5045338b1609f1e4 + languageName: node + linkType: hard + +"read-pkg-up@npm:^8.0.0": + version: 8.0.0 + resolution: "read-pkg-up@npm:8.0.0" + dependencies: + find-up: "npm:^5.0.0" + read-pkg: "npm:^6.0.0" + type-fest: "npm:^1.0.1" + checksum: 10c0/cf3905ccbe5cd602f23192cc7ca65ed17561bab117eadb9aed817441d5bfc6b9a11215c2a3e9505f501d046818f3c4180dbea61fa83c42083e0b4e407d5cc745 + languageName: node + linkType: hard + +"read-pkg@npm:^6.0.0": + version: 6.0.0 + resolution: "read-pkg@npm:6.0.0" + dependencies: + "@types/normalize-package-data": "npm:^2.4.0" + normalize-package-data: "npm:^3.0.2" + parse-json: "npm:^5.2.0" + type-fest: "npm:^1.0.1" + checksum: 10c0/b51ee5eed75324f4fac34c9a40b5e4b403de4c532242be01959c9bbdb1ff9db1c6c2aefaba569622fec49d1ead866e97ba856ab145f6e11039b11f7bec1318ba + languageName: node + linkType: hard + +"readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0, readable-stream@npm:^3.6.2": + version: 3.6.2 + resolution: "readable-stream@npm:3.6.2" + dependencies: + inherits: "npm:^2.0.3" + string_decoder: "npm:^1.1.1" + util-deprecate: "npm:^1.0.1" + checksum: 10c0/e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7 + languageName: node + linkType: hard + +"readable-stream@npm:^4.0.0": + version: 4.5.2 + resolution: "readable-stream@npm:4.5.2" + dependencies: + abort-controller: "npm:^3.0.0" + buffer: "npm:^6.0.3" + events: "npm:^3.3.0" + process: "npm:^0.11.10" + string_decoder: "npm:^1.3.0" + checksum: 10c0/a2c80e0e53aabd91d7df0330929e32d0a73219f9477dbbb18472f6fdd6a11a699fc5d172a1beff98d50eae4f1496c950ffa85b7cc2c4c196963f289a5f39275d + languageName: node + linkType: hard + +"readable-web-to-node-stream@npm:^3.0.2": + version: 3.0.2 + resolution: "readable-web-to-node-stream@npm:3.0.2" + dependencies: + readable-stream: "npm:^3.6.0" + checksum: 10c0/533d5cd1580232a2c753e52a245be13fc552e6f82c5053a8a8da7ea1063d73a34f936a86b3d4433cdb4a13dd683835cfc87f230936cb96d329a1e28b6040f42e + languageName: node + linkType: hard + +"readdirp@npm:~3.6.0": + version: 3.6.0 + resolution: "readdirp@npm:3.6.0" + dependencies: + picomatch: "npm:^2.2.1" + checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b + languageName: node + linkType: hard + +"real-require@npm:^0.2.0": + version: 0.2.0 + resolution: "real-require@npm:0.2.0" + checksum: 10c0/23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0 + languageName: node + linkType: hard + +"redent@npm:^4.0.0": + version: 4.0.0 + resolution: "redent@npm:4.0.0" + dependencies: + indent-string: "npm:^5.0.0" + strip-indent: "npm:^4.0.0" + checksum: 10c0/a9b640c8f4b2b5b26a1a908706475ff404dd50a97d6f094bc3c59717be922622927cc7d601d4ae2857d897ad243fd979bd76d751a0481cee8be7024e5fb4c662 + languageName: node + linkType: hard + +"require-from-string@npm:^2.0.2": + version: 2.0.2 + resolution: "require-from-string@npm:2.0.2" + checksum: 10c0/aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2 + languageName: node + linkType: hard + +"resolve-from@npm:^4.0.0": + version: 4.0.0 + resolution: "resolve-from@npm:4.0.0" + checksum: 10c0/8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190 + languageName: node + linkType: hard + +"resolve-pkg-maps@npm:^1.0.0": + version: 1.0.0 + resolution: "resolve-pkg-maps@npm:1.0.0" + checksum: 10c0/fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab + languageName: node + linkType: hard + +"resolve@npm:^1.22.4": + version: 1.22.8 + resolution: "resolve@npm:1.22.8" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": + version: 1.22.8 + resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729 + languageName: node + linkType: hard + +"ret@npm:~0.5.0": + version: 0.5.0 + resolution: "ret@npm:0.5.0" + checksum: 10c0/220868b194f87bf1998e32e409086eec6b39e860c052bf267f8ad4d0131706a9773d45fd3f91acfb1a7c928fce002b694ab86fdba90bc8d4b8df68fa8645c5cc + languageName: node + linkType: hard + +"retry@npm:^0.12.0": + version: 0.12.0 + resolution: "retry@npm:0.12.0" + checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe + languageName: node + linkType: hard + +"reusify@npm:^1.0.4": + version: 1.0.4 + resolution: "reusify@npm:1.0.4" + checksum: 10c0/c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107 + languageName: node + linkType: hard + +"rfdc@npm:^1.2.0, rfdc@npm:^1.3.1": + version: 1.4.1 + resolution: "rfdc@npm:1.4.1" + checksum: 10c0/4614e4292356cafade0b6031527eea9bc90f2372a22c012313be1dcc69a3b90c7338158b414539be863fa95bfcb2ddcd0587be696841af4e6679d85e62c060c7 + languageName: node + linkType: hard + +"rimraf@npm:^3.0.2": + version: 3.0.2 + resolution: "rimraf@npm:3.0.2" + dependencies: + glob: "npm:^7.1.3" + bin: + rimraf: bin.js + checksum: 10c0/9cb7757acb489bd83757ba1a274ab545eafd75598a9d817e0c3f8b164238dd90eba50d6b848bd4dcc5f3040912e882dc7ba71653e35af660d77b25c381d402e8 + languageName: node + linkType: hard + +"run-applescript@npm:^7.0.0": + version: 7.0.0 + resolution: "run-applescript@npm:7.0.0" + checksum: 10c0/bd821bbf154b8e6c8ecffeaf0c33cebbb78eb2987476c3f6b420d67ab4c5301faa905dec99ded76ebb3a7042b4e440189ae6d85bbbd3fc6e8d493347ecda8bfe + languageName: node + linkType: hard + +"run-parallel@npm:^1.1.9, run-parallel@npm:^1.2.0": + version: 1.2.0 + resolution: "run-parallel@npm:1.2.0" + dependencies: + queue-microtask: "npm:^1.2.2" + checksum: 10c0/200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39 + languageName: node + linkType: hard + +"safe-buffer@npm:~5.2.0": + version: 5.2.1 + resolution: "safe-buffer@npm:5.2.1" + checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3 + languageName: node + linkType: hard + +"safe-regex2@npm:^4.0.0": + version: 4.0.0 + resolution: "safe-regex2@npm:4.0.0" + dependencies: + ret: "npm:~0.5.0" + checksum: 10c0/faebf910036228868e83b4a33a84405b04e8e89f01283efe847e17e96b6b4658cc65c6560cef11de3bd5aef3b28b58dffac48744df67ca2ae46e073f668cb71d + languageName: node + linkType: hard + +"safe-stable-stringify@npm:^2.3.1": + version: 2.5.0 + resolution: "safe-stable-stringify@npm:2.5.0" + checksum: 10c0/baea14971858cadd65df23894a40588ed791769db21bafb7fd7608397dbdce9c5aac60748abae9995e0fc37e15f2061980501e012cd48859740796bea2987f49 + languageName: node + linkType: hard + +"safer-buffer@npm:>= 2.1.2 < 3.0.0": + version: 2.1.2 + resolution: "safer-buffer@npm:2.1.2" + checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4 + languageName: node + linkType: hard + +"secure-json-parse@npm:^2.7.0": + version: 2.7.0 + resolution: "secure-json-parse@npm:2.7.0" + checksum: 10c0/f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4 + languageName: node + linkType: hard + +"semver@npm:^6.0.0": + version: 6.3.1 + resolution: "semver@npm:6.3.1" + bin: + semver: bin/semver.js + checksum: 10c0/e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d + languageName: node + linkType: hard + +"semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.6.0, semver@npm:^7.6.3": + version: 7.6.3 + resolution: "semver@npm:7.6.3" + bin: + semver: bin/semver.js + checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf + languageName: node + linkType: hard + +"set-blocking@npm:^2.0.0": + version: 2.0.0 + resolution: "set-blocking@npm:2.0.0" + checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454 + languageName: node + linkType: hard + +"set-cookie-parser@npm:^2.6.0": + version: 2.7.0 + resolution: "set-cookie-parser@npm:2.7.0" + checksum: 10c0/5ccb2d0389bda27631d57e44644319f0b77200e7c8bd1515824eb83dbd2d351864a29581f7e7f977a5aeb83c3ec9976e69b706a80ac654152fd26353011ffef4 + languageName: node + linkType: hard + +"sharp@npm:^0.33.4": + version: 0.33.5 + resolution: "sharp@npm:0.33.5" + dependencies: + "@img/sharp-darwin-arm64": "npm:0.33.5" + "@img/sharp-darwin-x64": "npm:0.33.5" + "@img/sharp-libvips-darwin-arm64": "npm:1.0.4" + "@img/sharp-libvips-darwin-x64": "npm:1.0.4" + "@img/sharp-libvips-linux-arm": "npm:1.0.5" + "@img/sharp-libvips-linux-arm64": "npm:1.0.4" + "@img/sharp-libvips-linux-s390x": "npm:1.0.4" + "@img/sharp-libvips-linux-x64": "npm:1.0.4" + "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4" + "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4" + "@img/sharp-linux-arm": "npm:0.33.5" + "@img/sharp-linux-arm64": "npm:0.33.5" + "@img/sharp-linux-s390x": "npm:0.33.5" + "@img/sharp-linux-x64": "npm:0.33.5" + "@img/sharp-linuxmusl-arm64": "npm:0.33.5" + "@img/sharp-linuxmusl-x64": "npm:0.33.5" + "@img/sharp-wasm32": "npm:0.33.5" + "@img/sharp-win32-ia32": "npm:0.33.5" + "@img/sharp-win32-x64": "npm:0.33.5" + color: "npm:^4.2.3" + detect-libc: "npm:^2.0.3" + semver: "npm:^7.6.3" + dependenciesMeta: + "@img/sharp-darwin-arm64": + optional: true + "@img/sharp-darwin-x64": + optional: true + "@img/sharp-libvips-darwin-arm64": + optional: true + "@img/sharp-libvips-darwin-x64": + optional: true + "@img/sharp-libvips-linux-arm": + optional: true + "@img/sharp-libvips-linux-arm64": + optional: true + "@img/sharp-libvips-linux-s390x": + optional: true + "@img/sharp-libvips-linux-x64": + optional: true + "@img/sharp-libvips-linuxmusl-arm64": + optional: true + "@img/sharp-libvips-linuxmusl-x64": + optional: true + "@img/sharp-linux-arm": + optional: true + "@img/sharp-linux-arm64": + optional: true + "@img/sharp-linux-s390x": + optional: true + "@img/sharp-linux-x64": + optional: true + "@img/sharp-linuxmusl-arm64": + optional: true + "@img/sharp-linuxmusl-x64": + optional: true + "@img/sharp-wasm32": + optional: true + "@img/sharp-win32-ia32": + optional: true + "@img/sharp-win32-x64": + optional: true + checksum: 10c0/6b81421ddfe6ee524d8d77e325c5e147fef22884e1c7b1656dfd89a88d7025894115da02d5f984261bf2e6daa16f98cadd1721c4ba408b4212b1d2a60f233484 + languageName: node + linkType: hard + +"shebang-command@npm:^2.0.0": + version: 2.0.0 + resolution: "shebang-command@npm:2.0.0" + dependencies: + shebang-regex: "npm:^3.0.0" + checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e + languageName: node + linkType: hard + +"shebang-regex@npm:^3.0.0": + version: 3.0.0 + resolution: "shebang-regex@npm:3.0.0" + checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690 + languageName: node + linkType: hard + +"signal-exit@npm:^3.0.0": + version: 3.0.7 + resolution: "signal-exit@npm:3.0.7" + checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912 + languageName: node + linkType: hard + +"signal-exit@npm:^4.0.1": + version: 4.1.0 + resolution: "signal-exit@npm:4.1.0" + checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83 + languageName: node + linkType: hard + +"simple-concat@npm:^1.0.0": + version: 1.0.1 + resolution: "simple-concat@npm:1.0.1" + checksum: 10c0/62f7508e674414008910b5397c1811941d457dfa0db4fd5aa7fa0409eb02c3609608dfcd7508cace75b3a0bf67a2a77990711e32cd213d2c76f4fd12ee86d776 + languageName: node + linkType: hard + +"simple-get@npm:^3.0.3": + version: 3.1.1 + resolution: "simple-get@npm:3.1.1" + dependencies: + decompress-response: "npm:^4.2.0" + once: "npm:^1.3.1" + simple-concat: "npm:^1.0.0" + checksum: 10c0/438c78844ea1b1e7268d13ee0b3a39c7d644183367aec916aed3b676b45d3037a61d9f975c200a49b42eb851f29f03745118af1e13c01e60a7b4044f2fd60be7 + languageName: node + linkType: hard + +"simple-swizzle@npm:^0.2.2": + version: 0.2.2 + resolution: "simple-swizzle@npm:0.2.2" + dependencies: + is-arrayish: "npm:^0.3.1" + checksum: 10c0/df5e4662a8c750bdba69af4e8263c5d96fe4cd0f9fe4bdfa3cbdeb45d2e869dff640beaaeb1ef0e99db4d8d2ec92f85508c269f50c972174851bc1ae5bd64308 + languageName: node + linkType: hard + +"slash@npm:^4.0.0": + version: 4.0.0 + resolution: "slash@npm:4.0.0" + checksum: 10c0/b522ca75d80d107fd30d29df0549a7b2537c83c4c4ecd12cd7d4ea6c8aaca2ab17ada002e7a1d78a9d736a0261509f26ea5b489082ee443a3a810586ef8eff18 + languageName: node + linkType: hard + +"smart-buffer@npm:^4.2.0": + version: 4.2.0 + resolution: "smart-buffer@npm:4.2.0" + checksum: 10c0/a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539 + languageName: node + linkType: hard + +"socks-proxy-agent@npm:^8.0.3": + version: 8.0.4 + resolution: "socks-proxy-agent@npm:8.0.4" + dependencies: + agent-base: "npm:^7.1.1" + debug: "npm:^4.3.4" + socks: "npm:^2.8.3" + checksum: 10c0/345593bb21b95b0508e63e703c84da11549f0a2657d6b4e3ee3612c312cb3a907eac10e53b23ede3557c6601d63252103494caa306b66560f43af7b98f53957a + languageName: node + linkType: hard + +"socks@npm:^2.8.3": + version: 2.8.3 + resolution: "socks@npm:2.8.3" + dependencies: + ip-address: "npm:^9.0.5" + smart-buffer: "npm:^4.2.0" + checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7 + languageName: node + linkType: hard + +"sonic-boom@npm:^4.0.1": + version: 4.1.0 + resolution: "sonic-boom@npm:4.1.0" + dependencies: + atomic-sleep: "npm:^1.0.0" + checksum: 10c0/4c9e082db296fbfb02e22a1a9b8de8b82f5965697dda3fe7feadc4759bf25d1de0094e3c35f16e015bfdc00fad7b8cf15bef5b0144501a2a5c5b86efb5684096 + languageName: node + linkType: hard + +"spdx-correct@npm:^3.0.0": + version: 3.2.0 + resolution: "spdx-correct@npm:3.2.0" + dependencies: + spdx-expression-parse: "npm:^3.0.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10c0/49208f008618b9119208b0dadc9208a3a55053f4fd6a0ae8116861bd22696fc50f4142a35ebfdb389e05ccf2de8ad142573fefc9e26f670522d899f7b2fe7386 + languageName: node + linkType: hard + +"spdx-exceptions@npm:^2.1.0": + version: 2.5.0 + resolution: "spdx-exceptions@npm:2.5.0" + checksum: 10c0/37217b7762ee0ea0d8b7d0c29fd48b7e4dfb94096b109d6255b589c561f57da93bf4e328c0290046115961b9209a8051ad9f525e48d433082fc79f496a4ea940 + languageName: node + linkType: hard + +"spdx-expression-parse@npm:^3.0.0": + version: 3.0.1 + resolution: "spdx-expression-parse@npm:3.0.1" + dependencies: + spdx-exceptions: "npm:^2.1.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10c0/6f8a41c87759fa184a58713b86c6a8b028250f158159f1d03ed9d1b6ee4d9eefdc74181c8ddc581a341aa971c3e7b79e30b59c23b05d2436d5de1c30bdef7171 + languageName: node + linkType: hard + +"spdx-license-ids@npm:^3.0.0": + version: 3.0.20 + resolution: "spdx-license-ids@npm:3.0.20" + checksum: 10c0/bdff7534fad6ef59be49becda1edc3fb7f5b3d6f296a715516ab9d972b8ad59af2c34b2003e01db8970d4c673d185ff696ba74c6b61d3bf327e2b3eac22c297c + languageName: node + linkType: hard + +"split2@npm:^4.0.0": + version: 4.2.0 + resolution: "split2@npm:4.2.0" + checksum: 10c0/b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534 + languageName: node + linkType: hard + +"sprintf-js@npm:^1.1.3": + version: 1.1.3 + resolution: "sprintf-js@npm:1.1.3" + checksum: 10c0/09270dc4f30d479e666aee820eacd9e464215cdff53848b443964202bf4051490538e5dd1b42e1a65cf7296916ca17640aebf63dae9812749c7542ee5f288dec + languageName: node + linkType: hard + +"ssri@npm:^10.0.0": + version: 10.0.6 + resolution: "ssri@npm:10.0.6" + dependencies: + minipass: "npm:^7.0.3" + checksum: 10c0/e5a1e23a4057a86a97971465418f22ea89bd439ac36ade88812dd920e4e61873e8abd6a9b72a03a67ef50faa00a2daf1ab745c5a15b46d03e0544a0296354227 + languageName: node + linkType: hard + +"stable-hash@npm:^0.0.4": + version: 0.0.4 + resolution: "stable-hash@npm:0.0.4" + checksum: 10c0/53d010d2a1b014fb60d398c095f43912c353b7b44774e55222bb26fd428bc75b73d7bdfcae509ce927c23ca9c5aff2dc1bc82f191d30e57a879550bc2952bdb0 + languageName: node + linkType: hard + +"stack-trace@npm:0.0.x": + version: 0.0.10 + resolution: "stack-trace@npm:0.0.10" + checksum: 10c0/9ff3dabfad4049b635a85456f927a075c9d0c210e3ea336412d18220b2a86cbb9b13ec46d6c37b70a302a4ea4d49e30e5d4944dd60ae784073f1cde778ac8f4b + languageName: node + linkType: hard + +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.3": + version: 4.2.3 + resolution: "string-width@npm:4.2.3" + dependencies: + emoji-regex: "npm:^8.0.0" + is-fullwidth-code-point: "npm:^3.0.0" + strip-ansi: "npm:^6.0.1" + checksum: 10c0/1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b + languageName: node + linkType: hard + +"string-width@npm:^5.0.1, string-width@npm:^5.1.2": + version: 5.1.2 + resolution: "string-width@npm:5.1.2" + dependencies: + eastasianwidth: "npm:^0.2.0" + emoji-regex: "npm:^9.2.2" + strip-ansi: "npm:^7.0.1" + checksum: 10c0/ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca + languageName: node + linkType: hard + +"string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0": + version: 1.3.0 + resolution: "string_decoder@npm:1.3.0" + dependencies: + safe-buffer: "npm:~5.2.0" + checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d + languageName: node + linkType: hard + +"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": + version: 6.0.1 + resolution: "strip-ansi@npm:6.0.1" + dependencies: + ansi-regex: "npm:^5.0.1" + checksum: 10c0/1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952 + languageName: node + linkType: hard + +"strip-ansi@npm:^7.0.1": + version: 7.1.0 + resolution: "strip-ansi@npm:7.1.0" + dependencies: + ansi-regex: "npm:^6.0.1" + checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4 + languageName: node + linkType: hard + +"strip-indent@npm:^4.0.0": + version: 4.0.0 + resolution: "strip-indent@npm:4.0.0" + dependencies: + min-indent: "npm:^1.0.1" + checksum: 10c0/6b1fb4e22056867f5c9e7a6f3f45922d9a2436cac758607d58aeaac0d3b16ec40b1c43317de7900f1b8dd7a4107352fa47fb960f2c23566538c51e8585c8870e + languageName: node + linkType: hard + +"strip-json-comments@npm:^3.1.1": + version: 3.1.1 + resolution: "strip-json-comments@npm:3.1.1" + checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd + languageName: node + linkType: hard + +"strtok3@npm:^7.0.0": + version: 7.1.1 + resolution: "strtok3@npm:7.1.1" + dependencies: + "@tokenizer/token": "npm:^0.3.0" + peek-readable: "npm:^5.1.3" + checksum: 10c0/40c659917d12b925a2ae0781b5a6a6573a5fc99a08e2185ba93fc1e303e7e28935f8b3b83942fd39d0adf9ce1e9e4a3a3f6d984bc6376c14feb93a121fea454a + languageName: node + linkType: hard + +"supports-color@npm:^5.3.0": + version: 5.5.0 + resolution: "supports-color@npm:5.5.0" + dependencies: + has-flag: "npm:^3.0.0" + checksum: 10c0/6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05 + languageName: node + linkType: hard + +"supports-color@npm:^7.1.0": + version: 7.2.0 + resolution: "supports-color@npm:7.2.0" + dependencies: + has-flag: "npm:^4.0.0" + checksum: 10c0/afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124 + languageName: node + linkType: hard + +"supports-preserve-symlinks-flag@npm:^1.0.0": + version: 1.0.0 + resolution: "supports-preserve-symlinks-flag@npm:1.0.0" + checksum: 10c0/6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39 + languageName: node + linkType: hard + +"tar@npm:^6.1.11, tar@npm:^6.2.1": + version: 6.2.1 + resolution: "tar@npm:6.2.1" + dependencies: + chownr: "npm:^2.0.0" + fs-minipass: "npm:^2.0.0" + minipass: "npm:^5.0.0" + minizlib: "npm:^2.1.1" + mkdirp: "npm:^1.0.3" + yallist: "npm:^4.0.0" + checksum: 10c0/a5eca3eb50bc11552d453488344e6507156b9193efd7635e98e867fab275d527af53d8866e2370cd09dfe74378a18111622ace35af6a608e5223a7d27fe99537 + languageName: node + linkType: hard + +"text-hex@npm:1.0.x": + version: 1.0.0 + resolution: "text-hex@npm:1.0.0" + checksum: 10c0/57d8d320d92c79d7c03ffb8339b825bb9637c2cbccf14304309f51d8950015c44464b6fd1b6820a3d4821241c68825634f09f5a2d9d501e84f7c6fd14376860d + languageName: node + linkType: hard + +"text-table@npm:^0.2.0": + version: 0.2.0 + resolution: "text-table@npm:0.2.0" + checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c + languageName: node + linkType: hard + +"thread-stream@npm:^3.0.0": + version: 3.1.0 + resolution: "thread-stream@npm:3.1.0" + dependencies: + real-require: "npm:^0.2.0" + checksum: 10c0/c36118379940b77a6ef3e6f4d5dd31e97b8210c3f7b9a54eb8fe6358ab173f6d0acfaf69b9c3db024b948c0c5fd2a7df93e2e49151af02076b35ada3205ec9a6 + languageName: node + linkType: hard + +"to-regex-range@npm:^5.0.1": + version: 5.0.1 + resolution: "to-regex-range@npm:5.0.1" + dependencies: + is-number: "npm:^7.0.0" + checksum: 10c0/487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892 + languageName: node + linkType: hard + +"toad-cache@npm:^3.7.0": + version: 3.7.0 + resolution: "toad-cache@npm:3.7.0" + checksum: 10c0/7dae2782ee20b22c9798bb8b71dec7ec6a0091021d2ea9dd6e8afccab6b65b358fdba49a02209fac574499702e2c000660721516c87c2538d1b2c0ba03e8c0c3 + languageName: node + linkType: hard + +"token-types@npm:^5.0.1": + version: 5.0.1 + resolution: "token-types@npm:5.0.1" + dependencies: + "@tokenizer/token": "npm:^0.3.0" + ieee754: "npm:^1.2.1" + checksum: 10c0/cb671b2b52271362816d22b7a076082b0da033cd7807992b81ae53cfd8541bd013ac29e455c3c7a8bb4f88aa1c5315a12353c3599b7f568df238d3c1723f9d8d + languageName: node + linkType: hard + +"tr46@npm:~0.0.3": + version: 0.0.3 + resolution: "tr46@npm:0.0.3" + checksum: 10c0/047cb209a6b60c742f05c9d3ace8fa510bff609995c129a37ace03476a9b12db4dbf975e74600830ef0796e18882b2381fb5fb1f6b4f96b832c374de3ab91a11 + languageName: node + linkType: hard + +"trim-newlines@npm:^4.0.2": + version: 4.1.1 + resolution: "trim-newlines@npm:4.1.1" + checksum: 10c0/70e60e652305efd0dda1f2bce1a5edc9bb5834a2e00d05dfde178715ec48faa8264a2bc1a7efc593b7936d03f6d42c398616329eef44b7bd5070180a02056981 + languageName: node + linkType: hard + +"triple-beam@npm:^1.3.0": + version: 1.4.1 + resolution: "triple-beam@npm:1.4.1" + checksum: 10c0/4bf1db71e14fe3ff1c3adbe3c302f1fdb553b74d7591a37323a7badb32dc8e9c290738996cbb64f8b10dc5a3833645b5d8c26221aaaaa12e50d1251c9aba2fea + languageName: node + linkType: hard + +"ts-api-utils@npm:^1.3.0": + version: 1.3.0 + resolution: "ts-api-utils@npm:1.3.0" + peerDependencies: + typescript: ">=4.2.0" + checksum: 10c0/f54a0ba9ed56ce66baea90a3fa087a484002e807f28a8ccb2d070c75e76bde64bd0f6dce98b3802834156306050871b67eec325cb4e918015a360a3f0868c77c + languageName: node + linkType: hard + +"tslib@npm:^2.4.0, tslib@npm:^2.6.3": + version: 2.7.0 + resolution: "tslib@npm:2.7.0" + checksum: 10c0/469e1d5bf1af585742128827000711efa61010b699cb040ab1800bcd3ccdd37f63ec30642c9e07c4439c1db6e46345582614275daca3e0f4abae29b0083f04a6 + languageName: node + linkType: hard + +"tweetnacl@npm:^1.0.3": + version: 1.0.3 + resolution: "tweetnacl@npm:1.0.3" + checksum: 10c0/069d9df51e8ad4a89fbe6f9806c68e06c65be3c7d42f0701cc43dba5f0d6064686b238bbff206c5addef8854e3ce00c643bff59432ea2f2c639feab0ee1a93f9 + languageName: node + linkType: hard + +"type-check@npm:^0.4.0, type-check@npm:~0.4.0": + version: 0.4.0 + resolution: "type-check@npm:0.4.0" + dependencies: + prelude-ls: "npm:^1.2.1" + checksum: 10c0/7b3fd0ed43891e2080bf0c5c504b418fbb3e5c7b9708d3d015037ba2e6323a28152ec163bcb65212741fa5d2022e3075ac3c76440dbd344c9035f818e8ecee58 + languageName: node + linkType: hard + +"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2": + version: 1.4.0 + resolution: "type-fest@npm:1.4.0" + checksum: 10c0/a3c0f4ee28ff6ddf800d769eafafcdeab32efa38763c1a1b8daeae681920f6e345d7920bf277245235561d8117dab765cb5f829c76b713b4c9de0998a5397141 + languageName: node + linkType: hard + +"typescript-eslint@npm:^8.6.0": + version: 8.7.0 + resolution: "typescript-eslint@npm:8.7.0" + dependencies: + "@typescript-eslint/eslint-plugin": "npm:8.7.0" + "@typescript-eslint/parser": "npm:8.7.0" + "@typescript-eslint/utils": "npm:8.7.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/c0c3f909227c664f193d11a912851d6144a7cfcc0ac5e57f695c3e50679ef02bb491cc330ad9787e00170ce3be3a3b8c80bb81d5e20a40c1b3ee713ec3b0955a + languageName: node + linkType: hard + +"typescript@npm:^5.6.2": + version: 5.6.2 + resolution: "typescript@npm:5.6.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/3ed8297a8c7c56b7fec282532503d1ac795239d06e7c4966b42d4330c6cf433a170b53bcf93a130a7f14ccc5235de5560df4f1045eb7f3550b46ebed16d3c5e5 + languageName: node + linkType: hard + +"typescript@patch:typescript@npm%3A^5.6.2#optional!builtin": + version: 5.6.2 + resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=8c6c40" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/94eb47e130d3edd964b76da85975601dcb3604b0c848a36f63ac448d0104e93819d94c8bdf6b07c00120f2ce9c05256b8b6092d23cf5cf1c6fa911159e4d572f + languageName: node + linkType: hard + +"ufo@npm:^1.5.3": + version: 1.5.4 + resolution: "ufo@npm:1.5.4" + checksum: 10c0/b5dc4dc435c49c9ef8890f1b280a19ee4d0954d1d6f9ab66ce62ce64dd04c7be476781531f952a07c678d51638d02ad4b98e16237be29149295b0f7c09cda765 + languageName: node + linkType: hard + +"uncrypto@npm:^0.1.3": + version: 0.1.3 + resolution: "uncrypto@npm:0.1.3" + checksum: 10c0/74a29afefd76d5b77bedc983559ceb33f5bbc8dada84ff33755d1e3355da55a4e03a10e7ce717918c436b4dfafde1782e799ebaf2aadd775612b49f7b5b2998e + languageName: node + linkType: hard + +"undici-types@npm:~6.19.2": + version: 6.19.8 + resolution: "undici-types@npm:6.19.8" + checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344 + languageName: node + linkType: hard + +"unenv@npm:^1.9.0": + version: 1.10.0 + resolution: "unenv@npm:1.10.0" + dependencies: + consola: "npm:^3.2.3" + defu: "npm:^6.1.4" + mime: "npm:^3.0.0" + node-fetch-native: "npm:^1.6.4" + pathe: "npm:^1.1.2" + checksum: 10c0/354180647e21204b6c303339e7364b920baadb2672b540a88af267bc827636593e0bf79f59753dcc6b7ab5d4c83e71d69a9171a3596befb8bf77e0bb3c7612b9 + languageName: node + linkType: hard + +"unicorn-magic@npm:^0.1.0": + version: 0.1.0 + resolution: "unicorn-magic@npm:0.1.0" + checksum: 10c0/e4ed0de05b0a05e735c7d8a2930881e5efcfc3ec897204d5d33e7e6247f4c31eac92e383a15d9a6bccb7319b4271ee4bea946e211bf14951fec6ff2cbbb66a92 + languageName: node + linkType: hard + +"unique-filename@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-filename@npm:3.0.0" + dependencies: + unique-slug: "npm:^4.0.0" + checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f + languageName: node + linkType: hard + +"unique-slug@npm:^4.0.0": + version: 4.0.0 + resolution: "unique-slug@npm:4.0.0" + dependencies: + imurmurhash: "npm:^0.1.4" + checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635 + languageName: node + linkType: hard + +"uri-js@npm:^4.2.2": + version: 4.4.1 + resolution: "uri-js@npm:4.4.1" + dependencies: + punycode: "npm:^2.1.0" + checksum: 10c0/4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c + languageName: node + linkType: hard + +"util-deprecate@npm:^1.0.1": + version: 1.0.2 + resolution: "util-deprecate@npm:1.0.2" + checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942 + languageName: node + linkType: hard + +"uuid-by-string@npm:^4.0.0": + version: 4.0.0 + resolution: "uuid-by-string@npm:4.0.0" + dependencies: + js-md5: "npm:^0.7.3" + js-sha1: "npm:^0.6.0" + checksum: 10c0/b7d0a7540e3aeaa590c2e6cd2535d73f431a7d82a3293262f686899312bfd8b06c18308f98429ab4fca9a550d7daa5587f25aa49c0e1fefaaa28dc240ff56bba + languageName: node + linkType: hard + +"uuid@npm:^9.0.0": + version: 9.0.1 + resolution: "uuid@npm:9.0.1" + bin: + uuid: dist/bin/uuid + checksum: 10c0/1607dd32ac7fc22f2d8f77051e6a64845c9bce5cd3dd8aa0070c074ec73e666a1f63c7b4e0f4bf2bc8b9d59dc85a15e17807446d9d2b17c8485fbc2147b27f9b + languageName: node + linkType: hard + +"validate-npm-package-license@npm:^3.0.1": + version: 3.0.4 + resolution: "validate-npm-package-license@npm:3.0.4" + dependencies: + spdx-correct: "npm:^3.0.0" + spdx-expression-parse: "npm:^3.0.0" + checksum: 10c0/7b91e455a8de9a0beaa9fe961e536b677da7f48c9a493edf4d4d4a87fd80a7a10267d438723364e432c2fcd00b5650b5378275cded362383ef570276e6312f4f + languageName: node + linkType: hard + +"web-streams-polyfill@npm:^3.0.3": + version: 3.3.3 + resolution: "web-streams-polyfill@npm:3.3.3" + checksum: 10c0/64e855c47f6c8330b5436147db1c75cb7e7474d924166800e8e2aab5eb6c76aac4981a84261dd2982b3e754490900b99791c80ae1407a9fa0dcff74f82ea3a7f + languageName: node + linkType: hard + +"webidl-conversions@npm:^3.0.0": + version: 3.0.1 + resolution: "webidl-conversions@npm:3.0.1" + checksum: 10c0/5612d5f3e54760a797052eb4927f0ddc01383550f542ccd33d5238cfd65aeed392a45ad38364970d0a0f4fea32e1f4d231b3d8dac4a3bdd385e5cf802ae097db + languageName: node + linkType: hard + +"whatwg-url@npm:^5.0.0": + version: 5.0.0 + resolution: "whatwg-url@npm:5.0.0" + dependencies: + tr46: "npm:~0.0.3" + webidl-conversions: "npm:^3.0.0" + checksum: 10c0/1588bed84d10b72d5eec1d0faa0722ba1962f1821e7539c535558fb5398d223b0c50d8acab950b8c488b4ba69043fd833cc2697056b167d8ad46fac3995a55d5 + languageName: node + linkType: hard + +"which@npm:^2.0.1": + version: 2.0.2 + resolution: "which@npm:2.0.2" + dependencies: + isexe: "npm:^2.0.0" + bin: + node-which: ./bin/node-which + checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f + languageName: node + linkType: hard + +"which@npm:^4.0.0": + version: 4.0.0 + resolution: "which@npm:4.0.0" + dependencies: + isexe: "npm:^3.1.1" + bin: + node-which: bin/which.js + checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a + languageName: node + linkType: hard + +"wide-align@npm:^1.1.2": + version: 1.1.5 + resolution: "wide-align@npm:1.1.5" + dependencies: + string-width: "npm:^1.0.2 || 2 || 3 || 4" + checksum: 10c0/1d9c2a3e36dfb09832f38e2e699c367ef190f96b82c71f809bc0822c306f5379df87bab47bed27ea99106d86447e50eb972d3c516c2f95782807a9d082fbea95 + languageName: node + linkType: hard + +"winston-transport@npm:^4.7.0": + version: 4.7.1 + resolution: "winston-transport@npm:4.7.1" + dependencies: + logform: "npm:^2.6.1" + readable-stream: "npm:^3.6.2" + triple-beam: "npm:^1.3.0" + checksum: 10c0/99b7b55cc2ef7f38988ab1717e7fd946c81b856b42a9530aef8ee725490ef2f2811f9cb06d63aa2f76a85fe99ae15b3bef10a54afde3be8b5059ce325e78481f + languageName: node + linkType: hard + +"winston@npm:^3.11.0": + version: 3.14.2 + resolution: "winston@npm:3.14.2" + dependencies: + "@colors/colors": "npm:^1.6.0" + "@dabh/diagnostics": "npm:^2.0.2" + async: "npm:^3.2.3" + is-stream: "npm:^2.0.0" + logform: "npm:^2.6.0" + one-time: "npm:^1.0.0" + readable-stream: "npm:^3.4.0" + safe-stable-stringify: "npm:^2.3.1" + stack-trace: "npm:0.0.x" + triple-beam: "npm:^1.3.0" + winston-transport: "npm:^4.7.0" + checksum: 10c0/3f8fe505ea18310982e60452f335dd2b22fdbc9b25839b6ad882971b2416d5adc94a1f1a46e24cb37d967ad01dfe5499adaf5e53575626b5ebb2a25ff30f4e1d + languageName: node + linkType: hard + +"word-wrap@npm:^1.2.5": + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: 10c0/e0e4a1ca27599c92a6ca4c32260e8a92e8a44f4ef6ef93f803f8ed823f486e0889fc0b93be4db59c8d51b3064951d25e43d434e95dc8c960cc3a63d65d00ba20 + languageName: node + linkType: hard + +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version: 7.0.0 + resolution: "wrap-ansi@npm:7.0.0" + dependencies: + ansi-styles: "npm:^4.0.0" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + checksum: 10c0/d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da + languageName: node + linkType: hard + +"wrap-ansi@npm:^8.1.0": + version: 8.1.0 + resolution: "wrap-ansi@npm:8.1.0" + dependencies: + ansi-styles: "npm:^6.1.0" + string-width: "npm:^5.0.1" + strip-ansi: "npm:^7.0.1" + checksum: 10c0/138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60 + languageName: node + linkType: hard + +"wrappy@npm:1": + version: 1.0.2 + resolution: "wrappy@npm:1.0.2" + checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0 + languageName: node + linkType: hard + +"ws@npm:^8.18.0, ws@npm:^8.2.3": + version: 8.18.0 + resolution: "ws@npm:8.18.0" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ">=5.0.2" + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 10c0/25eb33aff17edcb90721ed6b0eb250976328533ad3cd1a28a274bd263682e7296a6591ff1436d6cbc50fa67463158b062f9d1122013b361cec99a05f84680e06 + languageName: node + linkType: hard + +"yallist@npm:^4.0.0": + version: 4.0.0 + resolution: "yallist@npm:4.0.0" + checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a + languageName: node + linkType: hard + +"yargs-parser@npm:^20.2.9": + version: 20.2.9 + resolution: "yargs-parser@npm:20.2.9" + checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72 + languageName: node + linkType: hard + +"yocto-queue@npm:^0.1.0": + version: 0.1.0 + resolution: "yocto-queue@npm:0.1.0" + checksum: 10c0/dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f + languageName: node + linkType: hard + +"yocto-queue@npm:^1.0.0": + version: 1.1.1 + resolution: "yocto-queue@npm:1.1.1" + checksum: 10c0/cb287fe5e6acfa82690acb43c283de34e945c571a78a939774f6eaba7c285bacdf6c90fbc16ce530060863984c906d2b4c6ceb069c94d1e0a06d5f2b458e2a92 + languageName: node + linkType: hard From db9da162392aba5d7c3ebf9f8f93a595c64ec864 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 25 Sep 2024 13:13:05 +0200 Subject: [PATCH 20/24] Fixed eslint issue not ignoring .js files --- api/eslint.config.mjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/eslint.config.mjs b/api/eslint.config.mjs index 9d5568f..424f1c9 100644 --- a/api/eslint.config.mjs +++ b/api/eslint.config.mjs @@ -7,9 +7,11 @@ import stylisticTs from '@stylistic/eslint-plugin-ts'; import importPluginX from 'eslint-plugin-import-x'; export default tseslint.config( + { // Having this as a separate object is apparently needed to actually ignore the .js files AND IT DOESN"T MAKE SENSE!!!!! + ignores: ['**/*.js', 'out/**/*.js', 'node_modules' ] + }, { files: ['src/**/*.ts', 'eslint.config.mjs'], - ignores: ['**/*.js', 'out/**/*.js', 'node_modules'], plugins: { '@typescript-eslint': tseslintPlugin, '@stylistic': stylistic, From 7b413be9eb39030b3b953826a648cfb508f0e7df Mon Sep 17 00:00:00 2001 From: RagingLink Date: Wed, 25 Sep 2024 16:13:50 +0200 Subject: [PATCH 21/24] Misc changes 123 --- .../routes/sharp/v1/managers/ImageEditor.ts | 1 + api/src/routes/sharp/v2/Context.ts | 4 ++-- api/src/routes/sharp/v2/Operation.ts | 6 +++--- .../{OperationSummary.ts => OperationMeta.ts} | 2 +- .../routes/sharp/v2/services/ImageEditor.ts | 3 ++- .../sharp/v2/services/OperationHandler.ts | 21 +++++++++---------- api/src/utils/env/parseEnv.ts | 6 +++--- 7 files changed, 22 insertions(+), 21 deletions(-) rename api/src/routes/sharp/v2/{OperationSummary.ts => OperationMeta.ts} (97%) diff --git a/api/src/routes/sharp/v1/managers/ImageEditor.ts b/api/src/routes/sharp/v1/managers/ImageEditor.ts index 71054ac..2e3b161 100644 --- a/api/src/routes/sharp/v1/managers/ImageEditor.ts +++ b/api/src/routes/sharp/v1/managers/ImageEditor.ts @@ -89,6 +89,7 @@ export class ImageEditor { //? If you don't make any changes to the image itself with sharp, you can keep the original Buffer //? This cuts out the time needed to go from sharp -> buffer (buffer -> sharp is negligible) + // ! OK BOZO then do it (v.2.0) for (const property of Object.keys(body)) { const operationTimer = new Timer(); switch (property) { diff --git a/api/src/routes/sharp/v2/Context.ts b/api/src/routes/sharp/v2/Context.ts index 5aaeae7..b00c5a1 100644 --- a/api/src/routes/sharp/v2/Context.ts +++ b/api/src/routes/sharp/v2/Context.ts @@ -1,6 +1,6 @@ import Image from './Image.js'; -import { OperationSummaryObject } from './OperationSummary.js'; -import OperationSummary from './OperationSummary.js'; +import { OperationSummaryObject } from './OperationMeta.js'; +import OperationSummary from './OperationMeta.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; diff --git a/api/src/routes/sharp/v2/Operation.ts b/api/src/routes/sharp/v2/Operation.ts index 7374dfe..d3ef529 100644 --- a/api/src/routes/sharp/v2/Operation.ts +++ b/api/src/routes/sharp/v2/Operation.ts @@ -3,8 +3,8 @@ import { Static, TSchema, Type } from '@sinclair/typebox'; import { TypeCheck, TypeCompiler } from '@sinclair/typebox/compiler'; import Image from './Image.js'; -import OperationDetails from './OperationSummary.js'; -import OperationSummary from './OperationSummary.js'; +import OperationDetails from './OperationMeta.js'; +import OperationSummary from './OperationMeta.js'; import { DefaultLogger } from '../../../utils/logging/NiceLogger.js'; @@ -74,7 +74,7 @@ export default class Operation implements IOperation { const errorIterables = this.compiler.Errors(data); const errors: string[] = []; for (const error of errorIterables) { - // Properties have a leading / in front, I'm not sure if this has any negative effects so this is still W.I.P + // ! Properties have a leading / in front, I'm not sure if this has any negative effects so this is still W.I.P const valuePath = error.path.slice(1); errors.push(`${valuePath} ${error.message}`.trimStart()); } diff --git a/api/src/routes/sharp/v2/OperationSummary.ts b/api/src/routes/sharp/v2/OperationMeta.ts similarity index 97% rename from api/src/routes/sharp/v2/OperationSummary.ts rename to api/src/routes/sharp/v2/OperationMeta.ts index f3d98a5..052f677 100644 --- a/api/src/routes/sharp/v2/OperationSummary.ts +++ b/api/src/routes/sharp/v2/OperationMeta.ts @@ -17,7 +17,7 @@ export type OperationDebugObject = { }; // I'm not sure about the naming of this class, but oh well! -export default class OperationSummary { +export default class OperationMeta { private errors: string[] = []; private warnings: string[] = []; private halted: boolean = false; diff --git a/api/src/routes/sharp/v2/services/ImageEditor.ts b/api/src/routes/sharp/v2/services/ImageEditor.ts index 9ccb823..612b531 100644 --- a/api/src/routes/sharp/v2/services/ImageEditor.ts +++ b/api/src/routes/sharp/v2/services/ImageEditor.ts @@ -41,7 +41,7 @@ export class ImageEditor { const imageBuffer = await this.fetcher.fetchImage(validatedInput.background); if (imageBuffer === undefined) { image.fetchDuration = Number(fetchTimer.elapsedMS); - image.context.addDebug('error', 'Invalid background source'); + image.context.addDebug('error', `Invalid background source: ${validatedInput.background}`); return image; } image.setBuffer(imageBuffer); @@ -54,6 +54,7 @@ export class ImageEditor { // Execute operations that are not cached for (const inputObj of remainingOperations) { const operation = this.operationHandler.getOperation(image.context, inputObj); + // I'm thinking of handling the errors here instead of in getOperation if (operation === undefined) continue; diff --git a/api/src/routes/sharp/v2/services/OperationHandler.ts b/api/src/routes/sharp/v2/services/OperationHandler.ts index 48dc68f..a628aa1 100644 --- a/api/src/routes/sharp/v2/services/OperationHandler.ts +++ b/api/src/routes/sharp/v2/services/OperationHandler.ts @@ -11,7 +11,7 @@ import Context, { CompletedOperationObject } from '../Context.js'; import Image from '../Image.js'; import Operation, { IGeneralOperation, IOperation } from '../Operation.js'; import { ValidInputObject } from '../validateInput.js'; -import OperationSummary from '../OperationSummary.js'; +import OperationMeta from '../OperationMeta.js'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import { GenericRecordType } from '../../../../utils/typebox/index.js'; @@ -64,9 +64,10 @@ export default class OperationHandler { continue; const isValid = operation.isValidData(input.operations[i].data); - if (!isValid) - continue; //TODO error/warning - + if (!isValid) { + image.context.addDebug('error', `[${operation.name}:${i}]: Invalid data`); + continue; + } const validOperationObject = { type: operation.name, data: input.operations[i].data @@ -75,7 +76,7 @@ export default class OperationHandler { if (validOperationObject.type in cachedOperations) { for (const cachedOperation of cachedOperations[validOperationObject.type]) { if (this.isEqual(validOperationObject, cachedOperation)) { - const cachedSummary = new OperationSummary(cachedOperation.type, cachedOperation.data, image); + const cachedSummary = new OperationMeta(cachedOperation.type, cachedOperation.data, image); image.context.addOperation(cachedSummary, cachedOperation.buffer); currentOperation = cachedOperation; @@ -128,8 +129,6 @@ export default class OperationHandler { currentBranch[type].push(nextBranch); currentBranch = nextBranch.nextOperationMap!; } - - //this.logger.log.operation('OperationHandler', `Added ${newOperations} operations`); } private async initOperations(): Promise { @@ -194,10 +193,10 @@ export default class OperationHandler { return Operation.prototype.isPrototypeOf(contents.default.prototype); } - private createHaltedSummary(context: Context, error: string, info?: { type?: string; data?: unknown; }): OperationSummary { - const unknownOperationSummary = new OperationSummary(info?.type ?? '', info?.data ?? undefined, context.image); - unknownOperationSummary.addError(error).halt(); - return unknownOperationSummary; + private createHaltedSummary(context: Context, error: string, info?: { type?: string; data?: unknown; }): OperationMeta { + const unknownOperationMeta = new OperationMeta(info?.type ?? '', info?.data ?? undefined, context.image); + unknownOperationMeta.addError(error).halt(); + return unknownOperationMeta; }; private isEqual(operation: GenericRecordType | CompletedOperationObject, cachedOperation: CachedOperation): boolean { diff --git a/api/src/utils/env/parseEnv.ts b/api/src/utils/env/parseEnv.ts index 5085333..98a8126 100644 --- a/api/src/utils/env/parseEnv.ts +++ b/api/src/utils/env/parseEnv.ts @@ -6,15 +6,15 @@ export const envSchema = Type.Object({ DOCS_HOST: Type.String(), PORT: Type.Number(), DATABASE_URL: Type.String() -}) +}); export type Env = Static; export default function parseEnv(): Env { - const env = dotenv.config().parsed + const env = dotenv.config().parsed; try { return Value.Parse(envSchema, env); - } catch (err: unknown) { + } catch { throw Error('Missing/invalid environment variables'); } } From 149e2cdb93dd4e88087fece4130b39d5dbd834f3 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Thu, 26 Sep 2024 10:11:28 +0200 Subject: [PATCH 22/24] Updated eslint config --- api/eslint.config.mjs | 245 +++++++++++++++++++++++------------------- api/package.json | 1 + api/yarn.lock | 49 ++++++++- 3 files changed, 185 insertions(+), 110 deletions(-) diff --git a/api/eslint.config.mjs b/api/eslint.config.mjs index 424f1c9..74c32a2 100644 --- a/api/eslint.config.mjs +++ b/api/eslint.config.mjs @@ -1,151 +1,178 @@ -//import eslint from '@eslint/js'; import tseslint from 'typescript-eslint'; import tseslintPlugin from '@typescript-eslint/eslint-plugin'; import tsParser from '@typescript-eslint/parser'; import stylistic from '@stylistic/eslint-plugin'; import stylisticTs from '@stylistic/eslint-plugin-ts'; import importPluginX from 'eslint-plugin-import-x'; +import sortKeysPlugin from 'eslint-plugin-sort-keys-fix'; + +const stylisticRules = { + '@stylistic/arrow-parens': ['error', 'always'], + '@stylistic/arrow-spacing': 'error', + '@stylistic/block-spacing': 'error', + '@stylistic/brace-style': ['warn', '1tbs', { + allowSingleLine: true + }], + '@stylistic/comma-dangle': 'warn', + '@stylistic/comma-spacing': 'error', + '@stylistic/comma-spacing': 'error', + '@stylistic/eol-last': ['warn', 'always'], + '@stylistic/indent': ['error', 4, { + SwitchCase: 1 + }], + '@stylistic/keyword-spacing': 'error', + '@stylistic/lines-between-class-members': ['error', { + enforce: [ + { blankLine: 'always', next: 'method', prev: 'field' }, + { blankLine: 'always', next: 'method', prev: 'method' }, + { blankLine: 'always', next: '*', prev: 'method' } + ] + }], + '@stylistic/max-statements-per-line': ['error', { + max: 1 + }], + '@stylistic/no-mixed-spaces-and-tabs': 2, + '@stylistic/no-multi-spaces': ['error'], + '@stylistic/no-multiple-empty-lines': ['warn', { + max: 1, + maxBOF: 0, + maxEOF: 0 + }], + '@stylistic/no-trailing-spaces': 'warn', + '@stylistic/no-whitespace-before-property': 'error', + '@stylistic/object-curly-spacing': ['error', 'always'], + '@stylistic/one-var-declaration-per-line': ['error', 'always'], + + '@stylistic/operator-linebreak': ['error', 'after'], + '@stylistic/quotes': ['error', 'single', { + avoidEscape: false + }], + '@stylistic/semi': [2, 'always'], + '@stylistic/semi-spacing': 'error', + '@stylistic/space-in-parens': 'error', + '@stylistic/space-infix-ops': 'error' +}; + +const typescriptRules = { + '@typescript-eslint/class-literal-property-style': 'error', + '@typescript-eslint/explicit-function-return-type': ['error', { + allowExpressions: true + }], + '@typescript-eslint/explicit-member-accessibility': 'error', + + '@typescript-eslint/no-floating-promises': 'error', + + '@typescript-eslint/no-unused-vars': ['warn', { + argsIgnorePattern: '^_', + caughtErrorsIgnorePattern: '^_', + varsIgnorePattern: '^_' + }], + '@typescript-eslint/return-await': 'error', + '@typescript-eslint/strict-boolean-expressions': ['error', { + allowAny: false, + allowNullableBoolean: false, + allowNullableNumber: false, + allowNullableObject: false, + allowNullableString: false, + allowNumber: false, + allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing: true, + allowString: false + }] +}; + +const importRules = { + 'import-x/extensions': ['error', 'always', { + ignorePackages: true + }], + 'import-x/newline-after-import': 'warn', + 'import-x/order': + [ + 'error', + { + 'distinctGroup': true, + 'groups': + [ + 'external', + 'builtin', + 'internal', + 'sibling', + 'parent', + 'index' + ], + 'newlines-between': 'always' + } + ], + 'sort-imports': ['error', { + 'ignoreCase': true, + 'ignoreDeclarationSort': true + }] +}; export default tseslint.config( { // Having this as a separate object is apparently needed to actually ignore the .js files AND IT DOESN"T MAKE SENSE!!!!! - ignores: ['**/*.js', 'out/**/*.js', 'node_modules' ] + ignores: ['**/*.js', 'out/**/*.js', 'node_modules'] }, { files: ['src/**/*.ts', 'eslint.config.mjs'], - plugins: { - '@typescript-eslint': tseslintPlugin, - '@stylistic': stylistic, - '@stylistic/ts': stylisticTs, - 'import-x': importPluginX - }, languageOptions: { + ecmaVersion: 'latest', parser: tsParser, parserOptions: { project: './eslint.tsconfig.json', tsconfigRootDir: import.meta.dirname, warnOnUnsupportedTypeScriptVersion: false - }, - ecmaVersion: 'latest' + } + }, + plugins: { + '@stylistic': stylistic, + '@stylistic/ts': stylisticTs, + '@typescript-eslint': tseslintPlugin, + 'import-x': importPluginX }, rules: { ...tseslint.configs.recommended.rules, ...tseslint.configs['strictTypeChecked'].rules, ...tseslint.configs['stylisticTypeChecked'].rules, - '@stylistic/no-mixed-spaces-and-tabs': 2, - '@stylistic/lines-between-class-members': ['error', 'always', { - exceptAfterSingleLine: true, - exceptAfterOverload: true - }], - - '@stylistic/object-curly-spacing': ['error', 'always'], - '@stylistic/operator-linebreak': ['error', 'after'], - '@stylistic/no-multi-spaces': ['error'], - '@stylistic/space-infix-ops': 'error', - '@stylistic/arrow-spacing': 'error', - '@stylistic/block-spacing': 'error', - '@stylistic/arrow-parens': ['error', 'always'], - // Sort imports and sort them into groups - 'import-x/order': - [ - 'error', - { - 'newlines-between': 'always', - 'distinctGroup': true, - 'groups': - [ - 'external', - 'builtin', - 'internal', - 'sibling', - 'parent', - 'index' - ] - } - ], - 'import-x/newline-after-import': 'warn', - 'import-x/extensions': ['error', 'always', { - ignorePackages: true - }], - 'sort-imports': ['error', { - 'ignoreCase': true, - 'ignoreDeclarationSort': true - }], - - '@stylistic/brace-style': ['warn', '1tbs', { - allowSingleLine: true - }], - - '@stylistic/comma-dangle': 'warn', - '@stylistic/comma-spacing': 'error', - '@stylistic/eol-last': ['warn', 'always'], - eqeqeq: 'error', + /** + * * Stylistic rules + */ + ...stylisticRules, + /** + * * Typescript rules + */ + ...typescriptRules, + /** + * * Sort imports + */ + ...importRules, + 'eqeqeq': 'error', 'guard-for-in': 'warn', - '@stylistic/indent': ['error', 4, { - SwitchCase: 1 - }], - - '@stylistic/max-statements-per-line': ['error', { - max: 1 - }], - '@stylistic/space-in-parens': 'error', - '@stylistic/comma-spacing': 'error', 'no-alert': 'error', + 'no-console': 'error', 'no-else-return': 'error', 'no-global-assign': 'error', 'no-iterator': 'error', 'no-lone-blocks': 'warn', 'no-lonely-if': 'error', - - '@stylistic/no-multiple-empty-lines': ['warn', { - max: 1, - maxEOF: 0, - maxBOF: 0 - }], - 'no-new-func': 'error', 'no-proto': 'error', 'no-sequences': 'error', - '@stylistic/no-trailing-spaces': 'warn', //'no-unused-vars': 'off', 'no-var': 'error', - 'one-var': ['error', 'never'], - '@stylistic/one-var-declaration-per-line': ['error', 'always'], - '@stylistic/quotes': ['error', 'single', { - avoidEscape: false - }], + 'one-var': ['error', 'never'] - '@stylistic/semi': [2, 'always'], - '@stylistic/semi-spacing': 'error', - '@stylistic/no-whitespace-before-property': 'error', - '@stylistic/keyword-spacing': 'error', - //Typescript - '@typescript-eslint/explicit-member-accessibility': 'error', - '@typescript-eslint/class-literal-property-style': 'error', - '@typescript-eslint/return-await': 'error', - - '@typescript-eslint/explicit-function-return-type': ['error', { - allowExpressions: true - }], - - '@typescript-eslint/strict-boolean-expressions': ['error', { - allowString: false, - allowNumber: false, - allowNullableObject: false, - allowNullableBoolean: false, - allowNullableString: false, - allowNullableNumber: false, - allowAny: false, - allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing: true - }], - '@typescript-eslint/no-unused-vars': ['warn', { - argsIgnorePattern: '^_', - varsIgnorePattern: '^_', - caughtErrorsIgnorePattern: '^_' - }], - '@typescript-eslint/no-floating-promises': 'error' + } + }, + { + files: ['eslint.config.mjs'], + plugins: { + 'sort-keys-fix': sortKeysPlugin + }, + rules: { + 'sort-keys-fix/sort-keys-fix': 'error' } } ); diff --git a/api/package.json b/api/package.json index aa14b25..37a72a4 100644 --- a/api/package.json +++ b/api/package.json @@ -65,6 +65,7 @@ "del-cli": "^5.1.0", "eslint": "^9.0.0", "eslint-plugin-import-x": "^4.2.1", + "eslint-plugin-sort-keys-fix": "^1.1.2", "prisma": "5.20.0", "typescript": "^5.6.2", "typescript-eslint": "^8.6.0" diff --git a/api/yarn.lock b/api/yarn.lock index 7d3e796..a3d59f5 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -1045,7 +1045,7 @@ __metadata: languageName: node linkType: hard -"acorn-jsx@npm:^5.3.2": +"acorn-jsx@npm:^5.2.0, acorn-jsx@npm:^5.3.2": version: 5.3.2 resolution: "acorn-jsx@npm:5.3.2" peerDependencies: @@ -1054,6 +1054,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^7.1.1": + version: 7.4.1 + resolution: "acorn@npm:7.4.1" + bin: + acorn: bin/acorn + checksum: 10c0/bd0b2c2b0f334bbee48828ff897c12bd2eb5898d03bf556dcc8942022cec795ac5bb5b6b585e2de687db6231faf07e096b59a361231dd8c9344d5df5f7f0e526 + languageName: node + linkType: hard + "acorn@npm:^8.11.3, acorn@npm:^8.12.0": version: 8.12.1 resolution: "acorn@npm:8.12.1" @@ -1214,6 +1223,7 @@ __metadata: eris: "npm:^0.17.1" eslint: "npm:^9.0.0" eslint-plugin-import-x: "npm:^4.2.1" + eslint-plugin-sort-keys-fix: "npm:^1.1.2" fastify: "npm:^5.0.0" file-type: "npm:^18.0.0" lodash: "npm:^4.17.21" @@ -2059,6 +2069,18 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-sort-keys-fix@npm:^1.1.2": + version: 1.1.2 + resolution: "eslint-plugin-sort-keys-fix@npm:1.1.2" + dependencies: + espree: "npm:^6.1.2" + esutils: "npm:^2.0.2" + natural-compare: "npm:^1.4.0" + requireindex: "npm:~1.2.0" + checksum: 10c0/4b916168b1d295cc4eca37a0ede149534ce3a25df0501ef92fdbda3ea2c6e8bdd2c25a2d6bce7cdf31900f34edbde3c45b4062f5b4fcefa82ce9ac49f2958615 + languageName: node + linkType: hard + "eslint-scope@npm:^8.0.2": version: 8.0.2 resolution: "eslint-scope@npm:8.0.2" @@ -2069,6 +2091,13 @@ __metadata: languageName: node linkType: hard +"eslint-visitor-keys@npm:^1.1.0": + version: 1.3.0 + resolution: "eslint-visitor-keys@npm:1.3.0" + checksum: 10c0/10c91fdbbe36810dd4308e57f9a8bc7177188b2a70247e54e3af1fa05ebc66414ae6fd4ce3c6c6821591f43a556e9037bc6b071122e099b5f8b7d2f76df553e3 + languageName: node + linkType: hard + "eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.3": version: 3.4.3 resolution: "eslint-visitor-keys@npm:3.4.3" @@ -2146,6 +2175,17 @@ __metadata: languageName: node linkType: hard +"espree@npm:^6.1.2": + version: 6.2.1 + resolution: "espree@npm:6.2.1" + dependencies: + acorn: "npm:^7.1.1" + acorn-jsx: "npm:^5.2.0" + eslint-visitor-keys: "npm:^1.1.0" + checksum: 10c0/499b47bc599ac3515598072ca787016bdaf0d463467ee1c7113061949359a26d74b8fb344afdad63e38b0e81c7b068013125f7a123d0776e0d75fffe2fc9cfac + languageName: node + linkType: hard + "esquery@npm:^1.5.0": version: 1.6.0 resolution: "esquery@npm:1.6.0" @@ -4083,6 +4123,13 @@ __metadata: languageName: node linkType: hard +"requireindex@npm:~1.2.0": + version: 1.2.0 + resolution: "requireindex@npm:1.2.0" + checksum: 10c0/7fb42aed73bf8de9acc4d6716cf07acc7fbe180e58729433bafcf702e76e7bb10e54f8266c06bfec62d752e0ac14d50e8758833de539e6f4e2cd642077866153 + languageName: node + linkType: hard + "resolve-from@npm:^4.0.0": version: 4.0.0 resolution: "resolve-from@npm:4.0.0" From c089750b545844145072f2b97b435020da852748 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Thu, 26 Sep 2024 10:11:55 +0200 Subject: [PATCH 23/24] Fixed linting issues and misc restructuring --- api/src/routes/sharp/Prisma.ts | 1 + api/src/routes/sharp/SharpDiscord.ts | 1 + api/src/routes/sharp/v1/managers/Image.ts | 1 + api/src/routes/sharp/v2/Context.ts | 1 + api/src/routes/sharp/v2/SharpRoute.ts | 28 +++++++++---------- api/src/routes/sharp/v2/operations/Resize.ts | 22 ++++++++++----- .../routes/sharp/v2/services/ImageEditor.ts | 11 +++++--- .../routes/sharp/v2/services/ImageFetcher.ts | 11 ++++++-- .../routes/sharp/v2/services/ImageManager.ts | 18 ------------ .../routes/sharp/v2/services/ImageStore.ts | 11 ++++++++ .../sharp/v2/services/OperationHandler.ts | 6 ++-- api/src/utils/CacheManager.ts | 1 + api/src/utils/HttpException.ts | 1 + api/src/utils/env/parseEnv.ts | 6 +++- 14 files changed, 71 insertions(+), 48 deletions(-) delete mode 100644 api/src/routes/sharp/v2/services/ImageManager.ts create mode 100644 api/src/routes/sharp/v2/services/ImageStore.ts diff --git a/api/src/routes/sharp/Prisma.ts b/api/src/routes/sharp/Prisma.ts index addaa35..75d483d 100644 --- a/api/src/routes/sharp/Prisma.ts +++ b/api/src/routes/sharp/Prisma.ts @@ -4,6 +4,7 @@ import { DefaultLogger } from '../../utils/logging/NiceLogger.js'; export default class Prisma { public readonly client: PrismaClient; + public constructor(public readonly logger: DefaultLogger) { this.client = new PrismaClient(); this.client.$connect().then(() => { diff --git a/api/src/routes/sharp/SharpDiscord.ts b/api/src/routes/sharp/SharpDiscord.ts index c55582d..6462d00 100644 --- a/api/src/routes/sharp/SharpDiscord.ts +++ b/api/src/routes/sharp/SharpDiscord.ts @@ -6,6 +6,7 @@ import { Config } from '../../types/Config.js'; export class SharpDiscord { private client: Client; private discordLastDisconnect = 0; + public constructor(public readonly logger: DefaultLogger, config: Config) { this.client = Eris(config.discord.token); this.client.on('ready', () => { diff --git a/api/src/routes/sharp/v1/managers/Image.ts b/api/src/routes/sharp/v1/managers/Image.ts index 8c7faca..9bf1c02 100644 --- a/api/src/routes/sharp/v1/managers/Image.ts +++ b/api/src/routes/sharp/v1/managers/Image.ts @@ -12,6 +12,7 @@ export default class Image { #height: number; public readonly operations: { action: keyof InputBody; data: InputBody[keyof InputBody]; }[]; public edited: boolean; + public constructor(public readonly buffer: Buffer, public readonly preEdited = false) { const { width, height } = sizeOf(buffer); this.#width = width; diff --git a/api/src/routes/sharp/v2/Context.ts b/api/src/routes/sharp/v2/Context.ts index b00c5a1..fe37f1f 100644 --- a/api/src/routes/sharp/v2/Context.ts +++ b/api/src/routes/sharp/v2/Context.ts @@ -23,6 +23,7 @@ export default class ImageContext { public operations: CompletedOperationObject[] = []; private generalWarnings: string[] = []; private generalErrors: string[] = []; + public constructor(public readonly logger: DefaultLogger, public readonly image: Image) { } diff --git a/api/src/routes/sharp/v2/SharpRoute.ts b/api/src/routes/sharp/v2/SharpRoute.ts index d311a10..88be2e4 100644 --- a/api/src/routes/sharp/v2/SharpRoute.ts +++ b/api/src/routes/sharp/v2/SharpRoute.ts @@ -2,30 +2,35 @@ import { FastifyPluginAsync } from 'fastify'; import { PassThrough } from 'stream'; -import ImageManager from './services/ImageManager.js'; +import ImageStore from './services/ImageStore.js'; +import { ImageEditor } from './services/ImageEditor.js'; +import ImageFetcher from './services/ImageFetcher.js'; import Timer from '../../../utils/Timer.js'; import { GenericRecord, GenericRecordType } from '../../../utils/typebox/index.js'; import API from '../../../api.js'; export default class SharpRoute { - public readonly manager: ImageManager; + public readonly store: ImageStore; + public readonly editor: ImageEditor; + public readonly fetcher: ImageFetcher; public readonly logger: API['logger']; public readonly plugin: FastifyPluginAsync; public constructor(public readonly api: API) { - this.manager = new ImageManager(api.logger); this.logger = api.logger; + this.store = new ImageStore(this); + this.editor = new ImageEditor(this); + this.fetcher = new ImageFetcher(this); this.plugin = async (fastify, _) => { fastify.post<{ Body: GenericRecordType }>('/image', { schema: { body: GenericRecord } }, async (req, reply) => { - const body = req.body; const timer = new Timer(true); try { - const image = await this.manager.postImage(body); + const image = await this.editor.editImage(req.body); this.logger.log.time('Processed image', timer.elapsedBlueStr); - const responseType = body.responseType ?? 'image'; + const responseType = req.body.responseType ?? 'image'; if (responseType === 'image') { const stream = new PassThrough(); @@ -40,14 +45,9 @@ export default class SharpRoute { } }); }; - //this.router.post('/image'); - // this.router.post('/', (req, res) => { - // const body = req.body; - // const timer = new Timer(true); - // }); } - // public parseJsonBody (req: Request, res: Response, next: NextFunction): void { - - // } + public get hostname(): string { + return this.api.env.NODE_ENV === 'dev' ? 'localhost' : 'api.nicelink.xyz'; + } } diff --git a/api/src/routes/sharp/v2/operations/Resize.ts b/api/src/routes/sharp/v2/operations/Resize.ts index f1d9b95..c01c5c4 100644 --- a/api/src/routes/sharp/v2/operations/Resize.ts +++ b/api/src/routes/sharp/v2/operations/Resize.ts @@ -3,14 +3,21 @@ import { Type } from '@sinclair/typebox'; import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Operation from '../Operation.js'; -export interface ResizeData { - width?: number; - height?: number; -} - +//TODO position/gravity option and background option const resizeSchema = Type.Object({ width: Type.Optional(Type.Number()), - height: Type.Optional(Type.Number()) + height: Type.Optional(Type.Number()), + fit: Type.Optional( + Type.Union([ + Type.Literal('cover'), + Type.Literal('contain'), + Type.Literal('fill'), + Type.Literal('inside'), + Type.Literal('outside') + ], { + default: 'fill' + }) + ) }); export default class ResizeOperation extends Operation { @@ -28,7 +35,8 @@ export default class ResizeOperation extends Operation { if (image.width === targetWidth && image.height === targetHeight) return image; - image.sharp.resize(data.width ?? null, data.height ?? null); + // ? in v1 I set the default to 'fill', but I may make sense to change it to sharp.js' default. + image.sharp.resize(data.width ?? null, data.height ?? null, { fit: data.fit ?? 'fill' }); return image; } diff --git a/api/src/routes/sharp/v2/services/ImageEditor.ts b/api/src/routes/sharp/v2/services/ImageEditor.ts index 612b531..6baaa88 100644 --- a/api/src/routes/sharp/v2/services/ImageEditor.ts +++ b/api/src/routes/sharp/v2/services/ImageEditor.ts @@ -3,12 +3,12 @@ import ImageFetcher from './ImageFetcher.js'; import OperationHandler from './OperationHandler.js'; -import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; import Image from '../Image.js'; import { validateRootInput } from '../validateInput.js'; import { CompletedOperationObject } from '../Context.js'; import { GenericObjectType } from '../../../../utils/typebox/index.js'; +import SharpRoute from '../SharpRoute.js'; export type CachedOperationMap = Record; export type CachedOperation = (CompletedOperationObject) & { @@ -19,9 +19,12 @@ export type CachedOperation = (CompletedOperationObject) & { export class ImageEditor { public readonly fetcher: ImageFetcher; public readonly operationHandler: OperationHandler; - public constructor(public readonly logger: DefaultLogger) { - this.fetcher = new ImageFetcher(logger); - this.operationHandler = new OperationHandler(logger); + public readonly logger: SharpRoute['logger']; + + public constructor(public readonly sharpRoute: SharpRoute) { + this.fetcher = sharpRoute.fetcher; + this.operationHandler = new OperationHandler(sharpRoute); + this.logger = sharpRoute.logger; } public async editImage(input: GenericObjectType): Promise { diff --git a/api/src/routes/sharp/v2/services/ImageFetcher.ts b/api/src/routes/sharp/v2/services/ImageFetcher.ts index 69c942d..aa75352 100644 --- a/api/src/routes/sharp/v2/services/ImageFetcher.ts +++ b/api/src/routes/sharp/v2/services/ImageFetcher.ts @@ -5,16 +5,19 @@ import path from 'path'; import url from 'url'; import CacheManager from '../../../../utils/CacheManager.js'; -import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import Timer from '../../../../utils/Timer.js'; +import API from '../../../../api.js'; +import SharpRoute from '../SharpRoute.js'; const transparentImagePath = path.join(url.fileURLToPath(new URL('.', import.meta.url)), '..', '..', '..', '..', '..', 'assets', 'img', 'transparent.png'); export default class ImageFetcher { + public readonly logger: API['logger']; public cache: CacheManager<{ buffer: Buffer; }>; public readonly defaultImageBuffer = fs.readFileSync(transparentImagePath); - public constructor(public readonly logger: DefaultLogger) { + public constructor(public readonly sharpRoute: SharpRoute) { + this.logger = sharpRoute.logger; this.cache = new CacheManager({ refresh: 0.5, hours: 48 }); } @@ -28,6 +31,10 @@ export default class ImageFetcher { return cachedImage.buffer; try { + const url = new URL(src); + if (url.hostname === this.sharpRoute.hostname) { + // + } const response = await fetch(src); // Caching invalid images may not be the best response in case the image gets 'fixed', but whatever if (response.status === 404) { diff --git a/api/src/routes/sharp/v2/services/ImageManager.ts b/api/src/routes/sharp/v2/services/ImageManager.ts deleted file mode 100644 index 274a7e7..0000000 --- a/api/src/routes/sharp/v2/services/ImageManager.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { ImageEditor } from './ImageEditor.js'; - -import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; -import Image from '../Image.js'; -import { GenericRecordType } from '../../../../utils/typebox/index.js'; - -export default class ImageManager { - private readonly editor: ImageEditor; - - public constructor (public readonly logger: DefaultLogger) { - this.editor = new ImageEditor(logger); - } - - public async postImage(input: GenericRecordType): Promise { - const image = await this.editor.editImage(input); - return image; - } -} diff --git a/api/src/routes/sharp/v2/services/ImageStore.ts b/api/src/routes/sharp/v2/services/ImageStore.ts new file mode 100644 index 0000000..d569034 --- /dev/null +++ b/api/src/routes/sharp/v2/services/ImageStore.ts @@ -0,0 +1,11 @@ +import API from '../../../../api.js'; +import SharpRoute from '../SharpRoute.js'; + +export default class ImageManager { + public readonly logger: API['logger']; + + public constructor (public readonly sharpRoute: SharpRoute) { + this.logger = sharpRoute.logger; + } + +} diff --git a/api/src/routes/sharp/v2/services/OperationHandler.ts b/api/src/routes/sharp/v2/services/OperationHandler.ts index a628aa1..cee8dc4 100644 --- a/api/src/routes/sharp/v2/services/OperationHandler.ts +++ b/api/src/routes/sharp/v2/services/OperationHandler.ts @@ -12,8 +12,8 @@ import Image from '../Image.js'; import Operation, { IGeneralOperation, IOperation } from '../Operation.js'; import { ValidInputObject } from '../validateInput.js'; import OperationMeta from '../OperationMeta.js'; -import { DefaultLogger } from '../../../../utils/logging/NiceLogger.js'; import { GenericRecordType } from '../../../../utils/typebox/index.js'; +import SharpRoute from '../SharpRoute.js'; interface ExportObj { default: unknown; @@ -21,10 +21,12 @@ interface ExportObj { const operationPath = path.join(fileURLToPath(new URL('.', import.meta.url)), '..', 'operations'); export default class OperationHandler { + public readonly logger: SharpRoute['logger']; private readonly cache: Record = {}; private readonly operations = new Map(); - public constructor(public readonly logger: DefaultLogger) { + public constructor(public readonly sharpRoute: SharpRoute) { + this.logger = sharpRoute.logger; void this.initOperations(); } diff --git a/api/src/utils/CacheManager.ts b/api/src/utils/CacheManager.ts index 54761f4..5737ff9 100644 --- a/api/src/utils/CacheManager.ts +++ b/api/src/utils/CacheManager.ts @@ -20,6 +20,7 @@ export default class CacheManager { private readonly cache: Map; private singleSweepHandler: ((id: string, obj: (DataObj & TimeInfo)) => void) | undefined; private multipleSweepHandler: ((items: [string, (DataObj & TimeInfo)][]) => void) | undefined; + public constructor(inputObj: CacheManagerArgument = {}) { this.durations = Object.assign({ hours: 24, refresh: 6 }, inputObj); this.cache = new Map(); diff --git a/api/src/utils/HttpException.ts b/api/src/utils/HttpException.ts index cf84c00..b3a772d 100644 --- a/api/src/utils/HttpException.ts +++ b/api/src/utils/HttpException.ts @@ -1,6 +1,7 @@ export default class HttpException extends Error { public status: number; public message: string; + public constructor(status: number, message: string) { super(message); this.status = status; diff --git a/api/src/utils/env/parseEnv.ts b/api/src/utils/env/parseEnv.ts index 98a8126..0d18ced 100644 --- a/api/src/utils/env/parseEnv.ts +++ b/api/src/utils/env/parseEnv.ts @@ -5,7 +5,11 @@ import dotenv from 'dotenv'; export const envSchema = Type.Object({ DOCS_HOST: Type.String(), PORT: Type.Number(), - DATABASE_URL: Type.String() + DATABASE_URL: Type.String(), + NODE_ENV: Type.Union([ + Type.Literal('dev'), + Type.Literal('prod') + ]) }); export type Env = Static; From edeba783db6ce6c39436b193d9a94c0835ce05e2 Mon Sep 17 00:00:00 2001 From: RagingLink Date: Thu, 26 Sep 2024 10:16:14 +0200 Subject: [PATCH 24/24] Removed unused eslint devDep --- api/package.json | 1 - api/yarn.lock | 743 +---------------------------------------------- 2 files changed, 12 insertions(+), 732 deletions(-) diff --git a/api/package.json b/api/package.json index 37a72a4..985a8a5 100644 --- a/api/package.json +++ b/api/package.json @@ -51,7 +51,6 @@ }, "homepage": "https://github.com/RagingLink/nicelink-api#readme", "devDependencies": { - "@eslint/config-inspector": "^0.5.4", "@stylistic/eslint-plugin": "^2.8.0", "@stylistic/eslint-plugin-ts": "^2.8.0", "@types/chalk": "^2.2.0", diff --git a/api/yarn.lock b/api/yarn.lock index a3d59f5..55174f3 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -61,167 +61,6 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/aix-ppc64@npm:0.21.5" - conditions: os=aix & cpu=ppc64 - languageName: node - linkType: hard - -"@esbuild/android-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/android-arm64@npm:0.21.5" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"@esbuild/android-arm@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/android-arm@npm:0.21.5" - conditions: os=android & cpu=arm - languageName: node - linkType: hard - -"@esbuild/android-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/android-x64@npm:0.21.5" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - -"@esbuild/darwin-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/darwin-arm64@npm:0.21.5" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@esbuild/darwin-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/darwin-x64@npm:0.21.5" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@esbuild/freebsd-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/freebsd-arm64@npm:0.21.5" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - -"@esbuild/freebsd-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/freebsd-x64@npm:0.21.5" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - -"@esbuild/linux-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-arm64@npm:0.21.5" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"@esbuild/linux-arm@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-arm@npm:0.21.5" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@esbuild/linux-ia32@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-ia32@npm:0.21.5" - conditions: os=linux & cpu=ia32 - languageName: node - linkType: hard - -"@esbuild/linux-loong64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-loong64@npm:0.21.5" - conditions: os=linux & cpu=loong64 - languageName: node - linkType: hard - -"@esbuild/linux-mips64el@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-mips64el@npm:0.21.5" - conditions: os=linux & cpu=mips64el - languageName: node - linkType: hard - -"@esbuild/linux-ppc64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-ppc64@npm:0.21.5" - conditions: os=linux & cpu=ppc64 - languageName: node - linkType: hard - -"@esbuild/linux-riscv64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-riscv64@npm:0.21.5" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - -"@esbuild/linux-s390x@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-s390x@npm:0.21.5" - conditions: os=linux & cpu=s390x - languageName: node - linkType: hard - -"@esbuild/linux-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-x64@npm:0.21.5" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"@esbuild/netbsd-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/netbsd-x64@npm:0.21.5" - conditions: os=netbsd & cpu=x64 - languageName: node - linkType: hard - -"@esbuild/openbsd-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/openbsd-x64@npm:0.21.5" - conditions: os=openbsd & cpu=x64 - languageName: node - linkType: hard - -"@esbuild/sunos-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/sunos-x64@npm:0.21.5" - conditions: os=sunos & cpu=x64 - languageName: node - linkType: hard - -"@esbuild/win32-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/win32-arm64@npm:0.21.5" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"@esbuild/win32-ia32@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/win32-ia32@npm:0.21.5" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - -"@esbuild/win32-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/win32-x64@npm:0.21.5" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" @@ -240,17 +79,6 @@ __metadata: languageName: node linkType: hard -"@eslint/config-array@npm:^0.17.1": - version: 0.17.1 - resolution: "@eslint/config-array@npm:0.17.1" - dependencies: - "@eslint/object-schema": "npm:^2.1.4" - debug: "npm:^4.3.1" - minimatch: "npm:^3.1.2" - checksum: 10c0/b986a0a96f2b42467578968ce3d4ae3b9284e587f8490f2dcdc44ff1b8d30580c62b221da6e58d07b09e156c3050e2dc38267f9370521d9cafc099c4e30154ef - languageName: node - linkType: hard - "@eslint/config-array@npm:^0.18.0": version: 0.18.0 resolution: "@eslint/config-array@npm:0.18.0" @@ -262,35 +90,6 @@ __metadata: languageName: node linkType: hard -"@eslint/config-inspector@npm:^0.5.4": - version: 0.5.4 - resolution: "@eslint/config-inspector@npm:0.5.4" - dependencies: - "@eslint/config-array": "npm:^0.17.1" - "@voxpelli/config-array-find-files": "npm:^0.1.2" - bundle-require: "npm:^5.0.0" - cac: "npm:^6.7.14" - chokidar: "npm:^3.6.0" - esbuild: "npm:^0.21.5" - fast-glob: "npm:^3.3.2" - find-up: "npm:^7.0.0" - get-port-please: "npm:^3.1.2" - h3: "npm:^1.12.0" - minimatch: "npm:^9.0.5" - mlly: "npm:^1.7.1" - mrmime: "npm:^2.0.0" - open: "npm:^10.1.0" - picocolors: "npm:^1.0.1" - ws: "npm:^8.18.0" - peerDependencies: - eslint: ^8.50.0 || ^9.0.0 - bin: - config-inspector: bin.mjs - eslint-config-inspector: bin.mjs - checksum: 10c0/d75da63243e6399c6b650886c6af33b61faa098d93bd30bc8349011bef1fbbbe1b780fffd57d1dd34f82590999a58a8413c495b7e9067bf8e1387447b6d7679b - languageName: node - linkType: hard - "@eslint/core@npm:^0.6.0": version: 0.6.0 resolution: "@eslint/core@npm:0.6.0" @@ -606,16 +405,6 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.scandir@npm:3.0.0": - version: 3.0.0 - resolution: "@nodelib/fs.scandir@npm:3.0.0" - dependencies: - "@nodelib/fs.stat": "npm:3.0.0" - run-parallel: "npm:^1.2.0" - checksum: 10c0/ff557a1d4dc779e41dd1108f92690a03bc3f0debd26a2c4d890fa3fe606646c2e6d958a9ccb3e59f2fd4751eed405151b7f1ab18947b5909ad67b64e155bc760 - languageName: node - linkType: hard - "@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2": version: 2.0.5 resolution: "@nodelib/fs.stat@npm:2.0.5" @@ -623,13 +412,6 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.stat@npm:3.0.0": - version: 3.0.0 - resolution: "@nodelib/fs.stat@npm:3.0.0" - checksum: 10c0/c798b6b07a3d93e29a98699dbda3380d28fe05194b2396b2d02670249691fe2758e0a7a32f1f760dabcbde05f3e0b2822c4b94e40c6c27b2db914c806e162687 - languageName: node - linkType: hard - "@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": version: 1.2.8 resolution: "@nodelib/fs.walk@npm:1.2.8" @@ -640,16 +422,6 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.walk@npm:^2.0.0": - version: 2.0.0 - resolution: "@nodelib/fs.walk@npm:2.0.0" - dependencies: - "@nodelib/fs.scandir": "npm:3.0.0" - fastq: "npm:^1.15.0" - checksum: 10c0/e490143c4596c89797f7c375104aeb0409a68492cd92c9344fcf2408a5a876580b56282b3d960d7f7d1346a41fd29cbb588707ac8dcc0b8d048ab38e1d2709cf - languageName: node - linkType: hard - "@npmcli/agent@npm:^2.0.0": version: 2.2.2 resolution: "@npmcli/agent@npm:2.2.2" @@ -1004,17 +776,6 @@ __metadata: languageName: node linkType: hard -"@voxpelli/config-array-find-files@npm:^0.1.2": - version: 0.1.2 - resolution: "@voxpelli/config-array-find-files@npm:0.1.2" - dependencies: - "@nodelib/fs.walk": "npm:^2.0.0" - peerDependencies: - "@eslint/config-array": ">=0.16.0" - checksum: 10c0/c7b1e8e674cf7e880c07374cb8091705d75dc85214c0c5a1fc10dd6e0bfe0f16a00b093e79fb22fe2bfbd3027cfc49adef0979c70a92c85c0395d1b1835657ab - languageName: node - linkType: hard - "abbrev@npm:1": version: 1.1.1 resolution: "abbrev@npm:1.1.1" @@ -1063,7 +824,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.11.3, acorn@npm:^8.12.0": +"acorn@npm:^8.12.0": version: 8.12.1 resolution: "acorn@npm:8.12.1" bin: @@ -1187,21 +948,10 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:~3.1.2": - version: 3.1.3 - resolution: "anymatch@npm:3.1.3" - dependencies: - normalize-path: "npm:^3.0.0" - picomatch: "npm:^2.0.4" - checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac - languageName: node - linkType: hard - "api@workspace:.": version: 0.0.0-use.local resolution: "api@workspace:." dependencies: - "@eslint/config-inspector": "npm:^0.5.4" "@prisma/client": "npm:5.20.0" "@sinclair/typebox": "npm:^0.33.12" "@stylistic/eslint-plugin": "npm:^2.8.0" @@ -1316,13 +1066,6 @@ __metadata: languageName: node linkType: hard -"binary-extensions@npm:^2.0.0": - version: 2.3.0 - resolution: "binary-extensions@npm:2.3.0" - checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5 - languageName: node - linkType: hard - "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -1342,7 +1085,7 @@ __metadata: languageName: node linkType: hard -"braces@npm:^3.0.3, braces@npm:~3.0.2": +"braces@npm:^3.0.3": version: 3.0.3 resolution: "braces@npm:3.0.3" dependencies: @@ -1370,33 +1113,6 @@ __metadata: languageName: node linkType: hard -"bundle-name@npm:^4.1.0": - version: 4.1.0 - resolution: "bundle-name@npm:4.1.0" - dependencies: - run-applescript: "npm:^7.0.0" - checksum: 10c0/8e575981e79c2bcf14d8b1c027a3775c095d362d1382312f444a7c861b0e21513c0bd8db5bd2b16e50ba0709fa622d4eab6b53192d222120305e68359daece29 - languageName: node - linkType: hard - -"bundle-require@npm:^5.0.0": - version: 5.0.0 - resolution: "bundle-require@npm:5.0.0" - dependencies: - load-tsconfig: "npm:^0.2.3" - peerDependencies: - esbuild: ">=0.18" - checksum: 10c0/92c46df02586e0ebd66ee4831c9b5775adb3c32a43fe2b2aaf7bc675135c141f751de6a9a26b146d64c607c5b40f9eef5f10dce3c364f602d4bed268444c32c6 - languageName: node - linkType: hard - -"cac@npm:^6.7.14": - version: 6.7.14 - resolution: "cac@npm:6.7.14" - checksum: 10c0/4ee06aaa7bab8981f0d54e5f5f9d4adcd64058e9697563ce336d8a3878ed018ee18ebe5359b2430eceae87e0758e62ea2019c3f52ae6e211b1bd2e133856cd10 - languageName: node - linkType: hard - "cacache@npm:^18.0.0": version: 18.0.4 resolution: "cacache@npm:18.0.4" @@ -1483,25 +1199,6 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.6.0": - version: 3.6.0 - resolution: "chokidar@npm:3.6.0" - dependencies: - anymatch: "npm:~3.1.2" - braces: "npm:~3.0.2" - fsevents: "npm:~2.3.2" - glob-parent: "npm:~5.1.2" - is-binary-path: "npm:~2.1.0" - is-glob: "npm:~4.0.1" - normalize-path: "npm:~3.0.0" - readdirp: "npm:~3.6.0" - dependenciesMeta: - fsevents: - optional: true - checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462 - languageName: node - linkType: hard - "chownr@npm:^2.0.0": version: 2.0.0 resolution: "chownr@npm:2.0.0" @@ -1622,20 +1319,6 @@ __metadata: languageName: node linkType: hard -"confbox@npm:^0.1.7": - version: 0.1.7 - resolution: "confbox@npm:0.1.7" - checksum: 10c0/18b40c2f652196a833f3f1a5db2326a8a579cd14eacabfe637e4fc8cb9b68d7cf296139a38c5e7c688ce5041bf46f9adce05932d43fde44cf7e012840b5da111 - languageName: node - linkType: hard - -"consola@npm:^3.2.3": - version: 3.2.3 - resolution: "consola@npm:3.2.3" - checksum: 10c0/c606220524ec88a05bb1baf557e9e0e04a0c08a9c35d7a08652d99de195c4ddcb6572040a7df57a18ff38bbc13ce9880ad032d56630cef27bef72768ef0ac078 - languageName: node - linkType: hard - "console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -1643,13 +1326,6 @@ __metadata: languageName: node linkType: hard -"cookie-es@npm:^1.1.0": - version: 1.2.2 - resolution: "cookie-es@npm:1.2.2" - checksum: 10c0/210eb67cd40a53986fda99d6f47118cfc45a69c4abc03490d15ab1b83ac978d5518356aecdd7a7a4969292445e3063c2302deda4c73706a67edc008127608638 - languageName: node - linkType: hard - "cookie@npm:^0.6.0": version: 0.6.0 resolution: "cookie@npm:0.6.0" @@ -1668,18 +1344,6 @@ __metadata: languageName: node linkType: hard -"crossws@npm:^0.2.4": - version: 0.2.4 - resolution: "crossws@npm:0.2.4" - peerDependencies: - uWebSockets.js: "*" - peerDependenciesMeta: - uWebSockets.js: - optional: true - checksum: 10c0/b950c64d36f3f11fdb8e0faf3107598660d89d77eb860e68b535fe6acba9f0f2f0507cc7250bd219a3ef2fe08718db91b591e6912b7324fcfc8fd1b8d9f78c96 - languageName: node - linkType: hard - "data-uri-to-buffer@npm:^4.0.0": version: 4.0.1 resolution: "data-uri-to-buffer@npm:4.0.1" @@ -1748,37 +1412,6 @@ __metadata: languageName: node linkType: hard -"default-browser-id@npm:^5.0.0": - version: 5.0.0 - resolution: "default-browser-id@npm:5.0.0" - checksum: 10c0/957fb886502594c8e645e812dfe93dba30ed82e8460d20ce39c53c5b0f3e2afb6ceaec2249083b90bdfbb4cb0f34e1f73fde3d68cac00becdbcfd894156b5ead - languageName: node - linkType: hard - -"default-browser@npm:^5.2.1": - version: 5.2.1 - resolution: "default-browser@npm:5.2.1" - dependencies: - bundle-name: "npm:^4.1.0" - default-browser-id: "npm:^5.0.0" - checksum: 10c0/73f17dc3c58026c55bb5538749597db31f9561c0193cd98604144b704a981c95a466f8ecc3c2db63d8bfd04fb0d426904834cfc91ae510c6aeb97e13c5167c4d - languageName: node - linkType: hard - -"define-lazy-prop@npm:^3.0.0": - version: 3.0.0 - resolution: "define-lazy-prop@npm:3.0.0" - checksum: 10c0/5ab0b2bf3fa58b3a443140bbd4cd3db1f91b985cc8a246d330b9ac3fc0b6a325a6d82bddc0b055123d745b3f9931afeea74a5ec545439a1630b9c8512b0eeb49 - languageName: node - linkType: hard - -"defu@npm:^6.1.4": - version: 6.1.4 - resolution: "defu@npm:6.1.4" - checksum: 10c0/2d6cc366262dc0cb8096e429368e44052fdf43ed48e53ad84cc7c9407f890301aa5fcb80d0995abaaf842b3949f154d060be4160f7a46cb2bc2f7726c81526f5 - languageName: node - linkType: hard - "del-cli@npm:^5.1.0": version: 5.1.0 resolution: "del-cli@npm:5.1.0" @@ -1822,13 +1455,6 @@ __metadata: languageName: node linkType: hard -"destr@npm:^2.0.3": - version: 2.0.3 - resolution: "destr@npm:2.0.3" - checksum: 10c0/10e7eff5149e2839a4dd29a1e9617c3c675a3b53608d78d74fc6f4abc31daa977e6de08e0eea78965527a0d5a35467ae2f9624e0a4646d54aa1162caa094473e - languageName: node - linkType: hard - "detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.3": version: 2.0.3 resolution: "detect-libc@npm:2.0.3" @@ -1937,86 +1563,6 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.21.5": - version: 0.21.5 - resolution: "esbuild@npm:0.21.5" - dependencies: - "@esbuild/aix-ppc64": "npm:0.21.5" - "@esbuild/android-arm": "npm:0.21.5" - "@esbuild/android-arm64": "npm:0.21.5" - "@esbuild/android-x64": "npm:0.21.5" - "@esbuild/darwin-arm64": "npm:0.21.5" - "@esbuild/darwin-x64": "npm:0.21.5" - "@esbuild/freebsd-arm64": "npm:0.21.5" - "@esbuild/freebsd-x64": "npm:0.21.5" - "@esbuild/linux-arm": "npm:0.21.5" - "@esbuild/linux-arm64": "npm:0.21.5" - "@esbuild/linux-ia32": "npm:0.21.5" - "@esbuild/linux-loong64": "npm:0.21.5" - "@esbuild/linux-mips64el": "npm:0.21.5" - "@esbuild/linux-ppc64": "npm:0.21.5" - "@esbuild/linux-riscv64": "npm:0.21.5" - "@esbuild/linux-s390x": "npm:0.21.5" - "@esbuild/linux-x64": "npm:0.21.5" - "@esbuild/netbsd-x64": "npm:0.21.5" - "@esbuild/openbsd-x64": "npm:0.21.5" - "@esbuild/sunos-x64": "npm:0.21.5" - "@esbuild/win32-arm64": "npm:0.21.5" - "@esbuild/win32-ia32": "npm:0.21.5" - "@esbuild/win32-x64": "npm:0.21.5" - dependenciesMeta: - "@esbuild/aix-ppc64": - optional: true - "@esbuild/android-arm": - optional: true - "@esbuild/android-arm64": - optional: true - "@esbuild/android-x64": - optional: true - "@esbuild/darwin-arm64": - optional: true - "@esbuild/darwin-x64": - optional: true - "@esbuild/freebsd-arm64": - optional: true - "@esbuild/freebsd-x64": - optional: true - "@esbuild/linux-arm": - optional: true - "@esbuild/linux-arm64": - optional: true - "@esbuild/linux-ia32": - optional: true - "@esbuild/linux-loong64": - optional: true - "@esbuild/linux-mips64el": - optional: true - "@esbuild/linux-ppc64": - optional: true - "@esbuild/linux-riscv64": - optional: true - "@esbuild/linux-s390x": - optional: true - "@esbuild/linux-x64": - optional: true - "@esbuild/netbsd-x64": - optional: true - "@esbuild/openbsd-x64": - optional: true - "@esbuild/sunos-x64": - optional: true - "@esbuild/win32-arm64": - optional: true - "@esbuild/win32-ia32": - optional: true - "@esbuild/win32-x64": - optional: true - bin: - esbuild: bin/esbuild - checksum: 10c0/fa08508adf683c3f399e8a014a6382a6b65542213431e26206c0720e536b31c09b50798747c2a105a4bbba1d9767b8d3615a74c2f7bf1ddf6d836cd11eb672de - languageName: node - linkType: hard - "escape-string-regexp@npm:5.0.0": version: 5.0.0 resolution: "escape-string-regexp@npm:5.0.0" @@ -2348,7 +1894,7 @@ __metadata: languageName: node linkType: hard -"fastq@npm:^1.15.0, fastq@npm:^1.17.1, fastq@npm:^1.6.0": +"fastq@npm:^1.17.1, fastq@npm:^1.6.0": version: 1.17.1 resolution: "fastq@npm:1.17.1" dependencies: @@ -2424,17 +1970,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:^7.0.0": - version: 7.0.0 - resolution: "find-up@npm:7.0.0" - dependencies: - locate-path: "npm:^7.2.0" - path-exists: "npm:^5.0.0" - unicorn-magic: "npm:^0.1.0" - checksum: 10c0/e6ee3e6154560bc0ab3bc3b7d1348b31513f9bdf49a5dd2e952495427d559fa48cdf33953e85a309a323898b43fa1bfbc8b80c880dfc16068384783034030008 - languageName: node - linkType: hard - "flat-cache@npm:^4.0.0": version: 4.0.1 resolution: "flat-cache@npm:4.0.1" @@ -2521,7 +2056,7 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:2.3.3, fsevents@npm:~2.3.2": +"fsevents@npm:2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" dependencies: @@ -2531,7 +2066,7 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": +"fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" dependencies: @@ -2564,13 +2099,6 @@ __metadata: languageName: node linkType: hard -"get-port-please@npm:^3.1.2": - version: 3.1.2 - resolution: "get-port-please@npm:3.1.2" - checksum: 10c0/61237342fe035967e5ad1b67a2dee347a64de093bf1222b7cd50072568d73c48dad5cc5cd4fa44635b7cfdcd14d6c47554edb9891c2ec70ab33ecb831683e257 - languageName: node - linkType: hard - "get-tsconfig@npm:^4.7.3": version: 4.8.1 resolution: "get-tsconfig@npm:4.8.1" @@ -2580,7 +2108,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": +"glob-parent@npm:^5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" dependencies: @@ -2662,24 +2190,6 @@ __metadata: languageName: node linkType: hard -"h3@npm:^1.12.0": - version: 1.12.0 - resolution: "h3@npm:1.12.0" - dependencies: - cookie-es: "npm:^1.1.0" - crossws: "npm:^0.2.4" - defu: "npm:^6.1.4" - destr: "npm:^2.0.3" - iron-webcrypto: "npm:^1.1.1" - ohash: "npm:^1.1.3" - radix3: "npm:^1.1.2" - ufo: "npm:^1.5.3" - uncrypto: "npm:^0.1.3" - unenv: "npm:^1.9.0" - checksum: 10c0/21ac3ee2451e96a74d6a4ec3a6e589c4725590dc4e675816436ae9d041556fc1b64052ba3775a48912f4ae98977031e1be4c57ac8a80bb4297117506b6ec7a6f - languageName: node - linkType: hard - "hard-rejection@npm:^2.1.0": version: 2.1.0 resolution: "hard-rejection@npm:2.1.0" @@ -2851,13 +2361,6 @@ __metadata: languageName: node linkType: hard -"iron-webcrypto@npm:^1.1.1": - version: 1.2.1 - resolution: "iron-webcrypto@npm:1.2.1" - checksum: 10c0/5cf27c6e2bd3ef3b4970e486235fd82491ab8229e2ed0ac23307c28d6c80d721772a86ed4e9fe2a5cabadd710c2f024b706843b40561fb83f15afee58f809f66 - languageName: node - linkType: hard - "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -2872,15 +2375,6 @@ __metadata: languageName: node linkType: hard -"is-binary-path@npm:~2.1.0": - version: 2.1.0 - resolution: "is-binary-path@npm:2.1.0" - dependencies: - binary-extensions: "npm:^2.0.0" - checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38 - languageName: node - linkType: hard - "is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0": version: 2.15.1 resolution: "is-core-module@npm:2.15.1" @@ -2890,15 +2384,6 @@ __metadata: languageName: node linkType: hard -"is-docker@npm:^3.0.0": - version: 3.0.0 - resolution: "is-docker@npm:3.0.0" - bin: - is-docker: cli.js - checksum: 10c0/d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856 - languageName: node - linkType: hard - "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -2913,7 +2398,7 @@ __metadata: languageName: node linkType: hard -"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": +"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3": version: 4.0.3 resolution: "is-glob@npm:4.0.3" dependencies: @@ -2922,17 +2407,6 @@ __metadata: languageName: node linkType: hard -"is-inside-container@npm:^1.0.0": - version: 1.0.0 - resolution: "is-inside-container@npm:1.0.0" - dependencies: - is-docker: "npm:^3.0.0" - bin: - is-inside-container: cli.js - checksum: 10c0/a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd - languageName: node - linkType: hard - "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" @@ -2982,15 +2456,6 @@ __metadata: languageName: node linkType: hard -"is-wsl@npm:^3.1.0": - version: 3.1.0 - resolution: "is-wsl@npm:3.1.0" - dependencies: - is-inside-container: "npm:^1.0.0" - checksum: 10c0/d3317c11995690a32c362100225e22ba793678fe8732660c6de511ae71a0ff05b06980cf21f98a6bf40d7be0e9e9506f859abe00a1118287d63e53d0a3d06947 - languageName: node - linkType: hard - "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -3152,13 +2617,6 @@ __metadata: languageName: node linkType: hard -"load-tsconfig@npm:^0.2.3": - version: 0.2.5 - resolution: "load-tsconfig@npm:0.2.5" - checksum: 10c0/bf2823dd26389d3497b6567f07435c5a7a58d9df82e879b0b3892f87d8db26900f84c85bc329ef41c0540c0d6a448d1c23ddc64a80f3ff6838b940f3915a3fcb - languageName: node - linkType: hard - "locate-path@npm:^6.0.0": version: 6.0.0 resolution: "locate-path@npm:6.0.0" @@ -3168,15 +2626,6 @@ __metadata: languageName: node linkType: hard -"locate-path@npm:^7.2.0": - version: 7.2.0 - resolution: "locate-path@npm:7.2.0" - dependencies: - p-locate: "npm:^6.0.0" - checksum: 10c0/139e8a7fe11cfbd7f20db03923cacfa5db9e14fa14887ea121345597472b4a63c1a42a8a5187defeeff6acf98fd568da7382aa39682d38f0af27433953a97751 - languageName: node - linkType: hard - "lodash.merge@npm:^4.6.2": version: 4.6.2 resolution: "lodash.merge@npm:4.6.2" @@ -3317,15 +2766,6 @@ __metadata: languageName: node linkType: hard -"mime@npm:^3.0.0": - version: 3.0.0 - resolution: "mime@npm:3.0.0" - bin: - mime: cli.js - checksum: 10c0/402e792a8df1b2cc41cb77f0dcc46472b7944b7ec29cb5bbcd398624b6b97096728f1239766d3fdeb20551dd8d94738344c195a6ea10c4f906eb0356323b0531 - languageName: node - linkType: hard - "mimic-response@npm:^2.0.0": version: 2.1.0 resolution: "mimic-response@npm:2.1.0" @@ -3349,7 +2789,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.3, minimatch@npm:^9.0.4, minimatch@npm:^9.0.5": +"minimatch@npm:^9.0.3, minimatch@npm:^9.0.4": version: 9.0.5 resolution: "minimatch@npm:9.0.5" dependencies: @@ -3462,25 +2902,6 @@ __metadata: languageName: node linkType: hard -"mlly@npm:^1.7.1": - version: 1.7.1 - resolution: "mlly@npm:1.7.1" - dependencies: - acorn: "npm:^8.11.3" - pathe: "npm:^1.1.2" - pkg-types: "npm:^1.1.1" - ufo: "npm:^1.5.3" - checksum: 10c0/d836a7b0adff4d118af41fb93ad4d9e57f80e694a681185280ba220a4607603c19e86c80f9a6c57512b04280567f2599e3386081705c5b5fd74c9ddfd571d0fa - languageName: node - linkType: hard - -"mrmime@npm:^2.0.0": - version: 2.0.0 - resolution: "mrmime@npm:2.0.0" - checksum: 10c0/312b35ed288986aec90955410b21ed7427fd1e4ee318cb5fc18765c8d029eeded9444faa46589e5b1ed6b35fb2054a802ac8dcb917ddf6b3e189cb3bf11a965c - languageName: node - linkType: hard - "ms@npm:^2.1.1, ms@npm:^2.1.3": version: 2.1.3 resolution: "ms@npm:2.1.3" @@ -3518,13 +2939,6 @@ __metadata: languageName: node linkType: hard -"node-fetch-native@npm:^1.6.4": - version: 1.6.4 - resolution: "node-fetch-native@npm:1.6.4" - checksum: 10c0/78334dc6def5d1d95cfe87b33ac76c4833592c5eb84779ad2b0c23c689f9dd5d1cfc827035ada72d6b8b218f717798968c5a99aeff0a1a8bf06657e80592f9c3 - languageName: node - linkType: hard - "node-fetch@npm:^2.6.7": version: 2.7.0 resolution: "node-fetch@npm:2.7.0" @@ -3611,13 +3025,6 @@ __metadata: languageName: node linkType: hard -"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": - version: 3.0.0 - resolution: "normalize-path@npm:3.0.0" - checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046 - languageName: node - linkType: hard - "npmlog@npm:^5.0.1": version: 5.0.1 resolution: "npmlog@npm:5.0.1" @@ -3637,13 +3044,6 @@ __metadata: languageName: node linkType: hard -"ohash@npm:^1.1.3": - version: 1.1.4 - resolution: "ohash@npm:1.1.4" - checksum: 10c0/73c3bcab2891ee2155ed62bb4c2906f622bf2204a3c9f4616ada8a6a76276bb6b4b4180eaf273b7c7d6232793e4d79d486aab436ebfc0d06d92a997f07122864 - languageName: node - linkType: hard - "on-exit-leak-free@npm:^2.1.0": version: 2.1.2 resolution: "on-exit-leak-free@npm:2.1.2" @@ -3669,18 +3069,6 @@ __metadata: languageName: node linkType: hard -"open@npm:^10.1.0": - version: 10.1.0 - resolution: "open@npm:10.1.0" - dependencies: - default-browser: "npm:^5.2.1" - define-lazy-prop: "npm:^3.0.0" - is-inside-container: "npm:^1.0.0" - is-wsl: "npm:^3.1.0" - checksum: 10c0/c86d0b94503d5f735f674158d5c5d339c25ec2927562f00ee74590727292ed23e1b8d9336cb41ffa7e1fa4d3641d29b199b4ea37c78cb557d72b511743e90ebb - languageName: node - linkType: hard - "optionator@npm:^0.9.3": version: 0.9.4 resolution: "optionator@npm:0.9.4" @@ -3711,15 +3099,6 @@ __metadata: languageName: node linkType: hard -"p-limit@npm:^4.0.0": - version: 4.0.0 - resolution: "p-limit@npm:4.0.0" - dependencies: - yocto-queue: "npm:^1.0.0" - checksum: 10c0/a56af34a77f8df2ff61ddfb29431044557fcbcb7642d5a3233143ebba805fc7306ac1d448de724352861cb99de934bc9ab74f0d16fe6a5460bdbdf938de875ad - languageName: node - linkType: hard - "p-locate@npm:^5.0.0": version: 5.0.0 resolution: "p-locate@npm:5.0.0" @@ -3729,15 +3108,6 @@ __metadata: languageName: node linkType: hard -"p-locate@npm:^6.0.0": - version: 6.0.0 - resolution: "p-locate@npm:6.0.0" - dependencies: - p-limit: "npm:^4.0.0" - checksum: 10c0/d72fa2f41adce59c198270aa4d3c832536c87a1806e0f69dffb7c1a7ca998fb053915ca833d90f166a8c082d3859eabfed95f01698a3214c20df6bb8de046312 - languageName: node - linkType: hard - "p-map@npm:^4.0.0": version: 4.0.0 resolution: "p-map@npm:4.0.0" @@ -3798,13 +3168,6 @@ __metadata: languageName: node linkType: hard -"path-exists@npm:^5.0.0": - version: 5.0.0 - resolution: "path-exists@npm:5.0.0" - checksum: 10c0/b170f3060b31604cde93eefdb7392b89d832dfbc1bed717c9718cbe0f230c1669b7e75f87e19901da2250b84d092989a0f9e44d2ef41deb09aa3ad28e691a40a - languageName: node - linkType: hard - "path-is-absolute@npm:^1.0.0": version: 1.0.1 resolution: "path-is-absolute@npm:1.0.1" @@ -3843,13 +3206,6 @@ __metadata: languageName: node linkType: hard -"pathe@npm:^1.1.2": - version: 1.1.2 - resolution: "pathe@npm:1.1.2" - checksum: 10c0/64ee0a4e587fb0f208d9777a6c56e4f9050039268faaaaecd50e959ef01bf847b7872785c36483fa5cdcdbdfdb31fef2ff222684d4fc21c330ab60395c681897 - languageName: node - linkType: hard - "pb-text-format-to-json@npm:^1.1.1": version: 1.1.2 resolution: "pb-text-format-to-json@npm:1.1.2" @@ -3866,14 +3222,14 @@ __metadata: languageName: node linkType: hard -"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1": +"picocolors@npm:^1.0.0": version: 1.1.0 resolution: "picocolors@npm:1.1.0" checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023 languageName: node linkType: hard -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.3.1": +"picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be @@ -3925,17 +3281,6 @@ __metadata: languageName: node linkType: hard -"pkg-types@npm:^1.1.1": - version: 1.2.0 - resolution: "pkg-types@npm:1.2.0" - dependencies: - confbox: "npm:^0.1.7" - mlly: "npm:^1.7.1" - pathe: "npm:^1.1.2" - checksum: 10c0/111cf6ad4235438821ea195a0d70570b1bd36a71d094d258349027c9c304dea8b4f9669c9f7ce813f9a48a02942fb0d7fe9809127dbe7bb4b18a8de71583a081 - languageName: node - linkType: hard - "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -4027,13 +3372,6 @@ __metadata: languageName: node linkType: hard -"radix3@npm:^1.1.2": - version: 1.1.2 - resolution: "radix3@npm:1.1.2" - checksum: 10c0/d4a295547f71af079868d2c2ed3814a9296ee026c5488212d58c106e6b4797c6eaec1259b46c9728913622f2240c9a944bfc8e2b3b5f6e4a5045338b1609f1e4 - languageName: node - linkType: hard - "read-pkg-up@npm:^8.0.0": version: 8.0.0 resolution: "read-pkg-up@npm:8.0.0" @@ -4090,15 +3428,6 @@ __metadata: languageName: node linkType: hard -"readdirp@npm:~3.6.0": - version: 3.6.0 - resolution: "readdirp@npm:3.6.0" - dependencies: - picomatch: "npm:^2.2.1" - checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b - languageName: node - linkType: hard - "real-require@npm:^0.2.0": version: 0.2.0 resolution: "real-require@npm:0.2.0" @@ -4209,14 +3538,7 @@ __metadata: languageName: node linkType: hard -"run-applescript@npm:^7.0.0": - version: 7.0.0 - resolution: "run-applescript@npm:7.0.0" - checksum: 10c0/bd821bbf154b8e6c8ecffeaf0c33cebbb78eb2987476c3f6b420d67ab4c5301faa905dec99ded76ebb3a7042b4e440189ae6d85bbbd3fc6e8d493347ecda8bfe - languageName: node - linkType: hard - -"run-parallel@npm:^1.1.9, run-parallel@npm:^1.2.0": +"run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" dependencies: @@ -4792,20 +4114,6 @@ __metadata: languageName: node linkType: hard -"ufo@npm:^1.5.3": - version: 1.5.4 - resolution: "ufo@npm:1.5.4" - checksum: 10c0/b5dc4dc435c49c9ef8890f1b280a19ee4d0954d1d6f9ab66ce62ce64dd04c7be476781531f952a07c678d51638d02ad4b98e16237be29149295b0f7c09cda765 - languageName: node - linkType: hard - -"uncrypto@npm:^0.1.3": - version: 0.1.3 - resolution: "uncrypto@npm:0.1.3" - checksum: 10c0/74a29afefd76d5b77bedc983559ceb33f5bbc8dada84ff33755d1e3355da55a4e03a10e7ce717918c436b4dfafde1782e799ebaf2aadd775612b49f7b5b2998e - languageName: node - linkType: hard - "undici-types@npm:~6.19.2": version: 6.19.8 resolution: "undici-types@npm:6.19.8" @@ -4813,26 +4121,6 @@ __metadata: languageName: node linkType: hard -"unenv@npm:^1.9.0": - version: 1.10.0 - resolution: "unenv@npm:1.10.0" - dependencies: - consola: "npm:^3.2.3" - defu: "npm:^6.1.4" - mime: "npm:^3.0.0" - node-fetch-native: "npm:^1.6.4" - pathe: "npm:^1.1.2" - checksum: 10c0/354180647e21204b6c303339e7364b920baadb2672b540a88af267bc827636593e0bf79f59753dcc6b7ab5d4c83e71d69a9171a3596befb8bf77e0bb3c7612b9 - languageName: node - linkType: hard - -"unicorn-magic@npm:^0.1.0": - version: 0.1.0 - resolution: "unicorn-magic@npm:0.1.0" - checksum: 10c0/e4ed0de05b0a05e735c7d8a2930881e5efcfc3ec897204d5d33e7e6247f4c31eac92e383a15d9a6bccb7319b4271ee4bea946e211bf14951fec6ff2cbbb66a92 - languageName: node - linkType: hard - "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -5017,7 +4305,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.18.0, ws@npm:^8.2.3": +"ws@npm:^8.2.3": version: 8.18.0 resolution: "ws@npm:8.18.0" peerDependencies: @@ -5052,10 +4340,3 @@ __metadata: checksum: 10c0/dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f languageName: node linkType: hard - -"yocto-queue@npm:^1.0.0": - version: 1.1.1 - resolution: "yocto-queue@npm:1.1.1" - checksum: 10c0/cb287fe5e6acfa82690acb43c283de34e945c571a78a939774f6eaba7c285bacdf6c90fbc16ce530060863984c906d2b4c6ceb069c94d1e0a06d5f2b458e2a92 - languageName: node - linkType: hard