From 6f477a44358f6aa662f1e0dc394110cba4455780 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Sun, 25 Aug 2024 16:15:10 +0900 Subject: [PATCH] Consola Signed-off-by: Sora Morimoto --- package.json | 2 +- src/code-gen-process.js | 20 +- .../templates-gen-process.js | 15 +- src/component-type-name-resolver.js | 10 +- src/index.js | 4 + src/schema-parser/base-schema-parsers/enum.js | 2 +- src/schema-parser/mono-schema-parser.js | 3 - src/schema-parser/schema-formatters.js | 3 - src/schema-parser/schema-parser-fabric.js | 4 - src/schema-parser/schema-parser.js | 6 +- src/schema-parser/util/enum-key-resolver.js | 8 +- src/schema-routes/schema-routes.js | 18 +- .../util/specific-arg-name-resolver.js | 8 +- src/schema-walker.js | 10 +- src/swagger-schema-resolver.js | 14 +- src/templates-worker.js | 26 +- src/translators/translator.js | 3 - src/type-name-formatter.js | 10 +- src/util/file-system.js | 13 +- src/util/logger.js | 141 ------ src/util/name-resolver.js | 13 +- src/util/request.js | 10 +- types/index.d.ts | 1 - yarn.lock | 439 ++++++++---------- 24 files changed, 259 insertions(+), 524 deletions(-) delete mode 100644 src/util/logger.js diff --git a/package.json b/package.json index 486345c7..e415c722 100644 --- a/package.json +++ b/package.json @@ -47,13 +47,13 @@ }, "dependencies": { "@types/swagger-schema-official": "^2.0.25", + "consola": "3.2.3", "cosmiconfig": "^9.0.0", "didyoumean": "^1.2.2", "eta": "^2.2.0", "js-yaml": "^4.1.0", "lodash": "^4.17.21", "nanoid": "^3.3.7", - "node-emoji": "^2.1.3", "prettier": "~3.3.3", "swagger-schema-official": "2.0.0-bab6bed", "swagger2openapi": "^7.0.8", diff --git a/src/code-gen-process.js b/src/code-gen-process.js index 6a287db7..d90ab3a2 100644 --- a/src/code-gen-process.js +++ b/src/code-gen-process.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import lodash from "lodash"; import * as typescript from "typescript"; import { CodeFormatter } from "./code-formatter.js"; @@ -12,7 +13,6 @@ import { JavascriptTranslator } from "./translators/javascript.js"; import { TypeNameFormatter } from "./type-name-formatter.js"; import { FileSystem } from "./util/file-system.js"; import { internalCase } from "./util/internal-case.js"; -import { Logger } from "./util/logger.js"; import { NameResolver } from "./util/name-resolver.js"; import { pascalCase } from "./util/pascal-case.js"; import { sortByProperty } from "./util/sort-by-property.js"; @@ -36,8 +36,6 @@ class CodeGenProcess { swaggerSchemaResolver; /** @type {SchemaComponentsMap} */ schemaComponentsMap; - /** @type {Logger} */ - logger; /** @type {TypeNameFormatter} */ typeNameFormatter; /** @type {SchemaParserFabric} */ @@ -61,7 +59,6 @@ class CodeGenProcess { */ constructor(config) { this.config = new CodeGenConfig(config); - this.logger = new Logger(this); this.fileSystem = new FileSystem(this); this.schemaWalker = new SchemaWalker(this); this.swaggerSchemaResolver = new SwaggerSchemaResolver(this); @@ -72,7 +69,6 @@ class CodeGenProcess { this.schemaParserFabric = new SchemaParserFabric(this); this.schemaRoutes = new SchemaRoutes(this); this.javascriptTranslator = new JavascriptTranslator(this); - this.config.componentTypeNameResolver.logger = this.logger; } async start() { @@ -95,7 +91,7 @@ class CodeGenProcess { this.schemaWalker.addSchema("$usage", swagger.usageSchema); this.schemaWalker.addSchema("$original", swagger.originalSchema); - this.logger.event("start generating your typescript api"); + consola.info("start generating your typescript api"); this.config.update( this.config.hooks.onInit(this.config, this) || this.config, @@ -160,11 +156,11 @@ class CodeGenProcess { if (this.fileSystem.pathIsExist(this.config.output)) { if (this.config.cleanOutput) { - this.logger.debug(`cleaning dir ${this.config.output}`); + consola.debug("cleaning dir", this.config.output); this.fileSystem.cleanDir(this.config.output); } } else { - this.logger.debug( + consola.debug( `path ${this.config.output} is not exist. creating dir by this path`, ); this.fileSystem.createDir(this.config.output); @@ -185,7 +181,7 @@ class CodeGenProcess { withPrefix: true, }); - this.logger.success( + consola.success( "api file", `"${file.fileName}${file.fileExtension}"`, `created in ${this.config.output}`, @@ -510,7 +506,7 @@ class CodeGenProcess { const fileExtension = typescript.Extension.Ts; if (configuration.translateToJavaScript) { - this.logger.debug("using js translator for", fileName); + consola.debug("using js translator for", fileName); return await this.javascriptTranslator.translate({ fileName: fileName, fileExtension: fileExtension, @@ -519,7 +515,7 @@ class CodeGenProcess { } if (configuration.customTranslator) { - this.logger.debug("using custom translator for", fileName); + consola.debug("using custom translator for", fileName); return await configuration.customTranslator.translate({ fileName: fileName, fileExtension: fileExtension, @@ -527,7 +523,7 @@ class CodeGenProcess { }); } - this.logger.debug("generating output for", `${fileName}${fileExtension}`); + consola.debug("generating output for", `${fileName}${fileExtension}`); return [ { diff --git a/src/commands/generate-templates/templates-gen-process.js b/src/commands/generate-templates/templates-gen-process.js index 5d174608..8c636d25 100644 --- a/src/commands/generate-templates/templates-gen-process.js +++ b/src/commands/generate-templates/templates-gen-process.js @@ -1,7 +1,7 @@ import path from "node:path"; import url from "node:url"; +import { consola } from "consola"; import { FileSystem } from "../../util/file-system.js"; -import { Logger } from "../../util/logger.js"; import { TemplatesGenConfig } from "./configuration.js"; const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); @@ -15,10 +15,6 @@ class TemplatesGenProcess { * @type {FileSystem} */ fileSystem; - /** - * @type {Logger} - */ - logger; rootDir = path.resolve(__dirname, "../../../"); @@ -33,7 +29,6 @@ class TemplatesGenProcess { constructor(config) { this.config = new TemplatesGenConfig(config); - this.logger = new Logger(this); this.fileSystem = new FileSystem(this); } @@ -41,14 +36,12 @@ class TemplatesGenProcess { * @return {Promise} */ async start() { - this.logger.event( - 'start generating source templates ".ejs" for code generator', - ); + consola.info('start generating source templates ".ejs" for code generator'); const templates = this.getTemplates(); if (this.config.output) { - this.logger.log("preparing output directory for source templates"); + consola.info("preparing output directory for source templates"); const outputPath = path.resolve(process.cwd(), this.config.output); if (this.fileSystem.pathIsExist(outputPath)) { @@ -96,7 +89,7 @@ class TemplatesGenProcess { } } - this.logger.success( + consola.success( `source templates has been successfully created in "${outputPath}"`, ); } diff --git a/src/component-type-name-resolver.js b/src/component-type-name-resolver.js index 080036bb..b4d45c16 100644 --- a/src/component-type-name-resolver.js +++ b/src/component-type-name-resolver.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import { NameResolver } from "./util/name-resolver.js"; import { getRandomInt } from "./util/random.js"; @@ -8,11 +9,10 @@ class ComponentTypeNameResolver extends NameResolver { /** * @param {CodeGenConfig} config; - * @param {Logger} logger; * @param {string[]} reservedNames */ - constructor(config, logger, reservedNames) { - super(config, logger, reservedNames, (variants) => { + constructor(config, reservedNames) { + super(config, reservedNames, (variants) => { const randomVariant = variants[getRandomInt(0, variants.length - 1)]; if (randomVariant) { if (!this.countersByVariant.has(randomVariant)) { @@ -21,7 +21,7 @@ class ComponentTypeNameResolver extends NameResolver { const variantCounter = this.countersByVariant.get(randomVariant) + 1; this.countersByVariant.set(randomVariant, variantCounter); const dirtyResolvedName = `${randomVariant}${variantCounter}`; - this.logger.debug( + consola.debug( "generated dirty resolved type name for component - ", dirtyResolvedName, ); @@ -30,7 +30,7 @@ class ComponentTypeNameResolver extends NameResolver { const fallbackName = `${this.config.componentTypeNameResolver}${this .fallbackNameCounter++}`; - this.logger.debug( + consola.debug( "generated fallback type name for component - ", fallbackName, ); diff --git a/src/index.js b/src/index.js index 140a70de..64ece6de 100644 --- a/src/index.js +++ b/src/index.js @@ -1,10 +1,14 @@ #!/usr/bin/env node +import { consola } from "consola"; import { CodeGenProcess } from "./code-gen-process.js"; import { generateTemplates } from "./commands/generate-templates/index.js"; import * as constants from "./constants.js"; async function generateApi({ name, prettier, ...config }) { + if (config.debug) { + consola.level = Number.MAX_SAFE_INTEGER; + } const codeGenProcess = new CodeGenProcess({ ...config, fileName: name, diff --git a/src/schema-parser/base-schema-parsers/enum.js b/src/schema-parser/base-schema-parsers/enum.js index 80e2d579..c4f285f7 100644 --- a/src/schema-parser/base-schema-parsers/enum.js +++ b/src/schema-parser/base-schema-parsers/enum.js @@ -9,7 +9,7 @@ class EnumSchemaParser extends MonoSchemaParser { constructor(...args) { super(...args); - this.enumKeyResolver = new EnumKeyResolver(this.config, this.logger, []); + this.enumKeyResolver = new EnumKeyResolver(this.config, []); } extractEnum = (pathTypeName) => { diff --git a/src/schema-parser/mono-schema-parser.js b/src/schema-parser/mono-schema-parser.js index b53132c0..9dc4ae42 100644 --- a/src/schema-parser/mono-schema-parser.js +++ b/src/schema-parser/mono-schema-parser.js @@ -3,8 +3,6 @@ class MonoSchemaParser { typeName; schemaPath; - /** @type {Logger} */ - logger; /** @type {SchemaParser} */ schemaParser; /** @type {SchemaParserFabric} */ @@ -23,7 +21,6 @@ class MonoSchemaParser { constructor(schemaParser, schema, typeName = null, schemaPath = []) { this.schemaParser = schemaParser; this.schemaParserFabric = schemaParser.schemaParserFabric; - this.logger = schemaParser.logger; this.schema = schema; this.typeName = typeName; this.typeNameFormatter = schemaParser.typeNameFormatter; diff --git a/src/schema-parser/schema-formatters.js b/src/schema-parser/schema-formatters.js index c9e65a89..09571cc3 100644 --- a/src/schema-parser/schema-formatters.js +++ b/src/schema-parser/schema-formatters.js @@ -4,8 +4,6 @@ import { SCHEMA_TYPES } from "../constants.js"; class SchemaFormatters { /** @type {CodeGenConfig} */ config; - /** @type {Logger} */ - logger; /** @type {TemplatesWorker} */ templatesWorker; /** @type {SchemaUtils} */ @@ -16,7 +14,6 @@ class SchemaFormatters { */ constructor(schemaParser) { this.config = schemaParser.config; - this.logger = schemaParser.logger; this.schemaUtils = schemaParser.schemaUtils; this.templatesWorker = schemaParser.templatesWorker; } diff --git a/src/schema-parser/schema-parser-fabric.js b/src/schema-parser/schema-parser-fabric.js index ba80f1d4..e09e2112 100644 --- a/src/schema-parser/schema-parser-fabric.js +++ b/src/schema-parser/schema-parser-fabric.js @@ -5,8 +5,6 @@ import { SchemaUtils } from "./schema-utils.js"; class SchemaParserFabric { /** @type {CodeGenConfig} */ config; - /** @type {Logger} */ - logger; /** @type {SchemaComponentsMap} */ schemaComponentsMap; /** @type {TypeNameFormatter} */ @@ -22,14 +20,12 @@ class SchemaParserFabric { constructor({ config, - logger, templatesWorker, schemaComponentsMap, typeNameFormatter, schemaWalker, }) { this.config = config; - this.logger = logger; this.schemaComponentsMap = schemaComponentsMap; this.typeNameFormatter = typeNameFormatter; this.templatesWorker = templatesWorker; diff --git a/src/schema-parser/schema-parser.js b/src/schema-parser/schema-parser.js index 8dc4bfab..d95a433b 100644 --- a/src/schema-parser/schema-parser.js +++ b/src/schema-parser/schema-parser.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import lodash from "lodash"; import { SCHEMA_TYPES } from "../constants.js"; import { sortByProperty } from "../util/sort-by-property.js"; @@ -19,8 +20,6 @@ class SchemaParser { schemaParserFabric; /** @type {CodeGenConfig} */ config; - /** @type {Logger} */ - logger; /** @type {SchemaComponentsMap} */ schemaComponentsMap; /** @type {TypeNameFormatter} */ @@ -41,7 +40,6 @@ class SchemaParser { constructor(schemaParserFabric, { typeName, schema, schemaPath } = {}) { this.schemaParserFabric = schemaParserFabric; this.config = schemaParserFabric.config; - this.logger = schemaParserFabric.logger; this.templatesWorker = schemaParserFabric.templatesWorker; this.schemaComponentsMap = schemaParserFabric.schemaComponentsMap; this.typeNameFormatter = schemaParserFabric.typeNameFormatter; @@ -206,7 +204,7 @@ class SchemaParser { this.schema.enum.length === 1 && this.schema.enum[0] == null ) { - this.logger.debug("invalid enum schema", this.schema); + consola.debug("invalid enum schema", this.schema); this.schema = { type: this.config.Ts.Keyword.Null }; } // schema is response schema diff --git a/src/schema-parser/util/enum-key-resolver.js b/src/schema-parser/util/enum-key-resolver.js index 844c9c51..a0e96d75 100644 --- a/src/schema-parser/util/enum-key-resolver.js +++ b/src/schema-parser/util/enum-key-resolver.js @@ -1,18 +1,18 @@ +import { consola } from "consola"; import { NameResolver } from "../../util/name-resolver.js"; class EnumKeyResolver extends NameResolver { counter = 1; /** * @param {CodeGenConfig} config; - * @param {Logger} logger; * @param {string[]} reservedNames */ - constructor(config, logger, reservedNames) { - super(config, logger, reservedNames, (variants) => { + constructor(config, reservedNames) { + super(config, reservedNames, (variants) => { const generatedVariant = (variants[0] && `${variants[0]}${this.counter++}`) || `${this.config.enumKeyResolverName}${this.counter++}`; - this.logger.debug( + consola.debug( "generated fallback type name for enum key - ", generatedVariant, ); diff --git a/src/schema-routes/schema-routes.js b/src/schema-routes/schema-routes.js index 85f2d2a7..2d5bc111 100644 --- a/src/schema-routes/schema-routes.js +++ b/src/schema-routes/schema-routes.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import lodash from "lodash"; import { DEFAULT_BODY_ARG_NAME, @@ -39,10 +40,6 @@ class SchemaRoutes { * @type {SchemaComponentsMap} */ schemaComponentsMap; - /** - * @type {Logger} - */ - logger; /** * @type {TemplatesWorker} */ @@ -59,7 +56,6 @@ class SchemaRoutes { config, schemaParserFabric, schemaComponentsMap, - logger, templatesWorker, typeNameFormatter, }) { @@ -68,7 +64,6 @@ class SchemaRoutes { this.schemaUtils = this.schemaParserFabric.schemaUtils; this.typeNameFormatter = typeNameFormatter; this.schemaComponentsMap = schemaComponentsMap; - this.logger = logger; this.templatesWorker = templatesWorker; this.FORM_DATA_TYPES = lodash.uniq([ @@ -121,7 +116,7 @@ class SchemaRoutes { if (!paramName) return pathParams; if (paramName.includes("-")) { - this.logger.warn("wrong path param name", paramName); + consola.warn("wrong path param name", paramName); } pathParams.push({ @@ -169,7 +164,7 @@ class SchemaRoutes { for (const paramName of paramNames) { if (paramName.includes("-")) { - this.logger.warn("wrong query param name", paramName); + consola.warn("wrong query param name", paramName); } queryParams.push({ @@ -803,9 +798,9 @@ class SchemaRoutes { routeNameDuplicatesMap.get(duplicateIdentifier) + 1, ); - this.logger.warn( - `Module "${moduleName}" already has method "${routeName}()"`, - `\nThis method has been renamed to "${ + consola.warn( + `Module "${moduleName}" already has method "${routeName}()".`, + `This method has been renamed to "${ routeName + routeNameDuplicatesMap.get(duplicateIdentifier) }()" to solve conflict names.`, ); @@ -971,7 +966,6 @@ class SchemaRoutes { const nameResolver = new SpecificArgNameResolver( this.config, - this.logger, pathArgsNames, ); diff --git a/src/schema-routes/util/specific-arg-name-resolver.js b/src/schema-routes/util/specific-arg-name-resolver.js index 2adee8da..928bcd37 100644 --- a/src/schema-routes/util/specific-arg-name-resolver.js +++ b/src/schema-routes/util/specific-arg-name-resolver.js @@ -1,18 +1,18 @@ +import { consola } from "consola"; import { NameResolver } from "../../util/name-resolver.js"; class SpecificArgNameResolver extends NameResolver { counter = 1; /** * @param {CodeGenConfig} config; - * @param {Logger} logger; * @param {string[]} reservedNames */ - constructor(config, logger, reservedNames) { - super(config, logger, reservedNames, (variants) => { + constructor(config, reservedNames) { + super(config, reservedNames, (variants) => { const generatedVariant = (variants[0] && `${variants[0]}${this.counter++}`) || `${this.config.specificArgNameResolverName}${this.counter++}`; - this.logger.debug( + consola.debug( "generated fallback type name for specific arg - ", generatedVariant, ); diff --git a/src/schema-walker.js b/src/schema-walker.js index 626129c1..4ef92b5c 100644 --- a/src/schema-walker.js +++ b/src/schema-walker.js @@ -1,10 +1,9 @@ +import { consola } from "consola"; import lodash from "lodash"; // TODO: WIP // this class will be needed to walk by schema everywhere class SchemaWalker { - /** @type {Logger} */ - logger; /** @type {CodeGenConfig} */ config; /** @type {SwaggerSchemaResolver} */ @@ -14,8 +13,7 @@ class SchemaWalker { /** @type {Map>} */ caches = new Map(); - constructor({ config, logger }) { - this.logger = logger; + constructor({ config }) { this.config = config; } @@ -32,7 +30,7 @@ class SchemaWalker { * @returns {any} */ findByRef = (ref) => { - this.logger.debug("try to resolve ref by path", ref); + consola.debug("try to resolve ref by path", ref); if (this.caches.has(ref)) { return this.caches.get(ref); @@ -47,7 +45,7 @@ class SchemaWalker { } } } else if (this._isRemoteRef(ref)) { - this.logger.debug("remote refs not supported", ref); + consola.debug("remote refs not supported", ref); return null; } else { const [address, path] = path.split("#"); diff --git a/src/swagger-schema-resolver.js b/src/swagger-schema-resolver.js index 1644717e..2e2aca99 100644 --- a/src/swagger-schema-resolver.js +++ b/src/swagger-schema-resolver.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import * as yaml from "js-yaml"; import lodash from "lodash"; import * as swagger2openapi from "swagger2openapi"; @@ -8,10 +9,6 @@ class SwaggerSchemaResolver { * @type {CodeGenConfig} */ config; - /** - * @type {Logger} - */ - logger; /** * @type {FileSystem} */ @@ -21,11 +18,10 @@ class SwaggerSchemaResolver { */ request; - constructor({ config, logger, fileSystem }) { + constructor({ config, fileSystem }) { this.config = config; - this.logger = logger; this.fileSystem = fileSystem; - this.request = new Request(config, logger); + this.request = new Request(config); } /** @@ -113,7 +109,7 @@ class SwaggerSchemaResolver { } getSwaggerSchemaByPath = (pathToSwagger) => { - this.logger.log(`try to get swagger by path "${pathToSwagger}"`); + consola.info(`try to get swagger by path "${pathToSwagger}"`); return this.fileSystem.getFileContent(pathToSwagger); }; @@ -127,7 +123,7 @@ class SwaggerSchemaResolver { if (this.fileSystem.pathIsExist(pathToSwagger)) { return this.getSwaggerSchemaByPath(pathToSwagger); } else { - this.logger.log(`try to get swagger by URL "${urlToSwagger}"`); + consola.info(`try to get swagger by URL "${urlToSwagger}"`); return await this.request.download({ url: urlToSwagger, disableStrictSSL, diff --git a/src/templates-worker.js b/src/templates-worker.js index 39767ec9..700c6230 100644 --- a/src/templates-worker.js +++ b/src/templates-worker.js @@ -1,5 +1,6 @@ import * as path from "node:path"; import * as url from "node:url"; +import { consola } from "consola"; import * as Eta from "eta"; import lodash from "lodash"; @@ -8,12 +9,6 @@ class TemplatesWorker { * @type {CodeGenConfig} */ config; - - /** - * @type {Logger} - */ - logger; - /** * @type {FileSystem} */ @@ -21,9 +16,8 @@ class TemplatesWorker { getRenderTemplateData; - constructor({ config, logger, fileSystem, getRenderTemplateData }) { + constructor({ config, fileSystem, getRenderTemplateData }) { this.config = config; - this.logger = logger; this.fileSystem = fileSystem; this.getRenderTemplateData = getRenderTemplateData; } @@ -115,7 +109,7 @@ class TemplatesWorker { customFullPath && this.fileSystem.getFileContent(customFullPath); if (fileContent) { - this.logger.log( + consola.info( `"${name.toLowerCase()}" template found in "${templatePaths.custom}"`, ); return fileContent; @@ -127,14 +121,14 @@ class TemplatesWorker { fileContent = this.fileSystem.getFileContent(baseFullPath); } else { if (templatePaths.custom) { - this.logger.warn( - `"${name.toLowerCase()}" template not found in "${ - templatePaths.custom - }"`, - "\nCode generator will use the default template", + consola.warn( + "Code generator will use the default template:", + `"${name.toLowerCase()}"`, + "template not found in", + `"${templatePaths.custom}"`, ); } else { - this.logger.log( + consola.info( `Code generator will use the default template for "${name.toLowerCase()}"`, ); } @@ -154,7 +148,7 @@ class TemplatesWorker { getTemplates = ({ templatePaths }) => { if (templatePaths.custom) { - this.logger.log( + consola.info( `try to read templates from directory "${templatePaths.custom}"`, ); } diff --git a/src/translators/translator.js b/src/translators/translator.js index fd3b73bb..43f6d3c2 100644 --- a/src/translators/translator.js +++ b/src/translators/translator.js @@ -3,8 +3,6 @@ */ class Translator { - /** @type {Logger} */ - logger; /** @type {CodeGenConfig} */ config; /** @type {CodeFormatter} */ @@ -14,7 +12,6 @@ class Translator { * @param codeGenProcess */ constructor(codeGenProcess) { - this.logger = codeGenProcess.logger; this.config = codeGenProcess.config; this.codeFormatter = codeGenProcess.codeFormatter; } diff --git a/src/type-name-formatter.js b/src/type-name-formatter.js index ba41e4cc..edcf23a9 100644 --- a/src/type-name-formatter.js +++ b/src/type-name-formatter.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import lodash from "lodash"; /** @@ -7,16 +8,11 @@ import lodash from "lodash"; class TypeNameFormatter { /** @type {Map} */ formattedModelNamesMap = new Map(); - /** @type {CodeGenConfig} */ config; - /** @type {Logger} */ - logger; - - constructor({ config, logger }) { + constructor({ config }) { this.config = config; - this.logger = logger; } /** @@ -39,7 +35,7 @@ class TypeNameFormatter { const hashKey = `${typePrefix}_${name}_${typeSuffix}`; if (typeof name !== "string") { - this.logger.warn("wrong name of the model name", name); + consola.warn("wrong name of the model name", name); return name; } diff --git a/src/util/file-system.js b/src/util/file-system.js index 031c145f..35b831bb 100644 --- a/src/util/file-system.js +++ b/src/util/file-system.js @@ -1,8 +1,8 @@ import * as fs from "node:fs"; import * as path from "node:path"; import * as url from "node:url"; +import { consola } from "consola"; import lodash from "lodash"; -import { Logger } from "./logger.js"; const FILE_PREFIX = `/* eslint-disable */ /* tslint:disable */ @@ -18,13 +18,6 @@ const FILE_PREFIX = `/* eslint-disable */ `; class FileSystem { - /** @type {Logger} */ - logger; - - constructor({ logger = new Logger("file-system") } = {}) { - this.logger = logger; - } - getFileContent = (path) => { return fs.readFileSync(path, { encoding: "utf8" }); }; @@ -62,7 +55,7 @@ class FileSystem { fs.rmdirSync(path, { recursive: true }); } } catch (e) { - this.logger.debug("failed to remove dir", e); + consola.debug("failed to remove dir", e); } }; @@ -70,7 +63,7 @@ class FileSystem { try { fs.mkdirSync(path, { recursive: true }); } catch (e) { - this.logger.debug("failed to create dir", e); + consola.debug("failed to create dir", e); } }; diff --git a/src/util/logger.js b/src/util/logger.js deleted file mode 100644 index 099195e3..00000000 --- a/src/util/logger.js +++ /dev/null @@ -1,141 +0,0 @@ -import * as nodeEmoji from "node-emoji"; - -class Logger { - firstLog = true; - /** - * @type {CodeGenConfig} - */ - config; - - constructor({ config }) { - this.config = config; - } - - createLogMessage = ({ type, emojiName, messages }) => { - if (this.config.silent) return; - - const emoji = nodeEmoji.emojify(emojiName); - - if (this.firstLog) { - this.firstLog = false; - this.log( - `swagger-typescript-api(${this.config.version}),${ - process.env.npm_config_user_agent || `nodejs(${process.version})` - },debug mode ${this.config.debug ? "ENABLED" : "DISABLED"}`, - ); - } - - if (type === "debug" || this.config.debug) { - const trace = new Error().stack - .split("\n") - .splice(3) - .filter( - (line) => - !line.includes("swagger-typescript-api\\node_modules") && - !line.includes("swagger-typescript-api/node_modules"), - ) - .slice(0, 10); - const logFn = console[type] || console.log; - logFn(`${emoji} [${type}]`, new Date().toISOString()); - if (this.config.debugExtras && Array.isArray(this.config.debugExtras)) { - logFn(`[${this.config.debugExtras.join(" ")}]`); - } - logFn( - "[message]", - ...messages.map((message) => - message.startsWith("\n") - ? `\n ${message.replace(/\n/, "")}` - : message, - ), - ); - logFn(`${trace.join("\n")}\n---`); - return; - } - - console[type]( - emoji, - " ", - ...messages.map((message) => - message.startsWith("\n") - ? `\n${emoji} ${message.replace(/\n/, "")}` - : message, - ), - ); - }; - - /** - * - * @param messages {any[]} - */ - log = (...messages) => - this.createLogMessage({ - type: "log", - emojiName: ":sparkles:", - messages, - }); - - /** - * - * @param messages {any[]} - * @return {void} - */ - event = (...messages) => - this.createLogMessage({ - type: "log", - emojiName: ":star:", - messages, - }); - - /** - * - * @param messages {any[]} - * @return {void} - */ - success = (...messages) => - this.createLogMessage({ - type: "log", - emojiName: ":white_check_mark:", - messages, - }); - - /** - * - * @param messages {any[]} - * @return {void} - */ - warn = (...messages) => - this.createLogMessage({ - type: "warn", - emojiName: ":exclamation:", - messages, - }); - - /** - * - * @param messages {any[]} - * @return {void} - */ - error = (...messages) => - this.createLogMessage({ - type: "error", - emojiName: ":no_entry:", - messages, - }); - - /** - * - * @param messages {any[]} - * @return {void} - */ - debug = (...messages) => { - if (!this.config.debug) return; - - this.createLogMessage({ - type: "debug", - emojiName: ":black_large_square:", - messages, - }); - }; -} - -export { Logger }; diff --git a/src/util/name-resolver.js b/src/util/name-resolver.js index 4ff9199d..49dcdf6f 100644 --- a/src/util/name-resolver.js +++ b/src/util/name-resolver.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import lodash from "lodash"; class NameResolver { @@ -6,17 +7,13 @@ class NameResolver { /** @type {CodeGenConfig} */ config; - /** @type {Logger} */ - logger; /** * @param {CodeGenConfig} config; - * @param {Logger} logger; * @param {string[]} reservedNames */ - constructor(config, logger, reservedNames, getFallbackName) { + constructor(config, reservedNames, getFallbackName) { this.config = config; - this.logger = logger; this.getFallbackName = getFallbackName; this.reserve(reservedNames); } @@ -57,7 +54,7 @@ class NameResolver { const variant = resolver(variants, extras); if (variant === undefined) { - this.logger.warn( + consola.warn( "unable to resolve name. current reserved names: ", this.reservedNames, ); @@ -87,14 +84,14 @@ class NameResolver { return usageName; } - this.logger.debug( + consola.debug( "trying to resolve name with using fallback name generator using variants", variants, ); return this.resolve(variants, this.getFallbackName, extras); } - this.logger.debug( + consola.debug( "problem with reserving names. current reserved names: ", this.reservedNames, ); diff --git a/src/util/request.js b/src/util/request.js index 0bc39aec..42abe891 100644 --- a/src/util/request.js +++ b/src/util/request.js @@ -1,3 +1,4 @@ +import { consola } from "consola"; import lodash from "lodash"; class Request { @@ -5,14 +6,9 @@ class Request { * @type {CodeGenConfig} */ config; - /** - * @type {Logger} - */ - logger; - constructor(config, logger) { + constructor(config) { this.config = config; - this.logger = logger; } /** @@ -54,7 +50,7 @@ class Request { return await response.text(); } catch (error) { const message = `error while fetching data from URL "${url}"`; - this.logger.error(message, "response" in error ? error.response : error); + consola.error(message, "response" in error ? error.response : error); return message; } } diff --git a/types/index.d.ts b/types/index.d.ts index abe9e8b6..587b3a00 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -199,7 +199,6 @@ interface GenerateApiParamsBase { * translate({ fileName, fileExtension, fileContent }) { * this.codeFormatter.format() * this.config. - * this.logger. * * return [ * { diff --git a/yarn.lock b/yarn.lock index 19ab034a..9643918d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -142,9 +142,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/aix-ppc64@npm:0.23.0" +"@esbuild/aix-ppc64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/aix-ppc64@npm:0.23.1" conditions: os=aix & cpu=ppc64 languageName: node linkType: hard @@ -156,9 +156,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/android-arm64@npm:0.23.0" +"@esbuild/android-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-arm64@npm:0.23.1" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -170,9 +170,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/android-arm@npm:0.23.0" +"@esbuild/android-arm@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-arm@npm:0.23.1" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -184,9 +184,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/android-x64@npm:0.23.0" +"@esbuild/android-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/android-x64@npm:0.23.1" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -198,9 +198,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/darwin-arm64@npm:0.23.0" +"@esbuild/darwin-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/darwin-arm64@npm:0.23.1" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -212,9 +212,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/darwin-x64@npm:0.23.0" +"@esbuild/darwin-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/darwin-x64@npm:0.23.1" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -226,9 +226,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/freebsd-arm64@npm:0.23.0" +"@esbuild/freebsd-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/freebsd-arm64@npm:0.23.1" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -240,9 +240,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/freebsd-x64@npm:0.23.0" +"@esbuild/freebsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/freebsd-x64@npm:0.23.1" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -254,9 +254,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-arm64@npm:0.23.0" +"@esbuild/linux-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-arm64@npm:0.23.1" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -268,9 +268,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-arm@npm:0.23.0" +"@esbuild/linux-arm@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-arm@npm:0.23.1" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -282,9 +282,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-ia32@npm:0.23.0" +"@esbuild/linux-ia32@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-ia32@npm:0.23.1" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -296,9 +296,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-loong64@npm:0.23.0" +"@esbuild/linux-loong64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-loong64@npm:0.23.1" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -310,9 +310,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-mips64el@npm:0.23.0" +"@esbuild/linux-mips64el@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-mips64el@npm:0.23.1" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -324,9 +324,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-ppc64@npm:0.23.0" +"@esbuild/linux-ppc64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-ppc64@npm:0.23.1" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -338,9 +338,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-riscv64@npm:0.23.0" +"@esbuild/linux-riscv64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-riscv64@npm:0.23.1" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -352,9 +352,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-s390x@npm:0.23.0" +"@esbuild/linux-s390x@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-s390x@npm:0.23.1" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -366,9 +366,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/linux-x64@npm:0.23.0" +"@esbuild/linux-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/linux-x64@npm:0.23.1" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -380,16 +380,16 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/netbsd-x64@npm:0.23.0" +"@esbuild/netbsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/netbsd-x64@npm:0.23.1" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/openbsd-arm64@npm:0.23.0" +"@esbuild/openbsd-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/openbsd-arm64@npm:0.23.1" conditions: os=openbsd & cpu=arm64 languageName: node linkType: hard @@ -401,9 +401,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/openbsd-x64@npm:0.23.0" +"@esbuild/openbsd-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/openbsd-x64@npm:0.23.1" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -415,9 +415,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/sunos-x64@npm:0.23.0" +"@esbuild/sunos-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/sunos-x64@npm:0.23.1" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -429,9 +429,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/win32-arm64@npm:0.23.0" +"@esbuild/win32-arm64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-arm64@npm:0.23.1" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -443,9 +443,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/win32-ia32@npm:0.23.0" +"@esbuild/win32-ia32@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-ia32@npm:0.23.1" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -457,9 +457,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.23.0": - version: 0.23.0 - resolution: "@esbuild/win32-x64@npm:0.23.0" +"@esbuild/win32-x64@npm:0.23.1": + version: 0.23.1 + resolution: "@esbuild/win32-x64@npm:0.23.1" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -583,125 +583,118 @@ __metadata: languageName: node linkType: hard -"@rollup/rollup-android-arm-eabi@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-android-arm-eabi@npm:4.20.0" +"@rollup/rollup-android-arm-eabi@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.21.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@rollup/rollup-android-arm64@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-android-arm64@npm:4.20.0" +"@rollup/rollup-android-arm64@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-android-arm64@npm:4.21.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-arm64@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-darwin-arm64@npm:4.20.0" +"@rollup/rollup-darwin-arm64@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-darwin-arm64@npm:4.21.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-darwin-x64@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-darwin-x64@npm:4.20.0" +"@rollup/rollup-darwin-x64@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-darwin-x64@npm:4.21.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@rollup/rollup-linux-arm-gnueabihf@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.20.0" +"@rollup/rollup-linux-arm-gnueabihf@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.21.0" conditions: os=linux & cpu=arm & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm-musleabihf@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.20.0" +"@rollup/rollup-linux-arm-musleabihf@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.21.0" conditions: os=linux & cpu=arm & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-arm64-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.20.0" +"@rollup/rollup-linux-arm64-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.21.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-arm64-musl@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-arm64-musl@npm:4.20.0" +"@rollup/rollup-linux-arm64-musl@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.21.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-linux-powerpc64le-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.20.0" +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.0" conditions: os=linux & cpu=ppc64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-riscv64-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.20.0" +"@rollup/rollup-linux-riscv64-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.21.0" conditions: os=linux & cpu=riscv64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-s390x-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.20.0" +"@rollup/rollup-linux-s390x-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.21.0" conditions: os=linux & cpu=s390x & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-gnu@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-x64-gnu@npm:4.20.0" +"@rollup/rollup-linux-x64-gnu@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.21.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@rollup/rollup-linux-x64-musl@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-linux-x64-musl@npm:4.20.0" +"@rollup/rollup-linux-x64-musl@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.21.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@rollup/rollup-win32-arm64-msvc@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.20.0" +"@rollup/rollup-win32-arm64-msvc@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.21.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@rollup/rollup-win32-ia32-msvc@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.20.0" +"@rollup/rollup-win32-ia32-msvc@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.21.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@rollup/rollup-win32-x64-msvc@npm:4.20.0": - version: 4.20.0 - resolution: "@rollup/rollup-win32-x64-msvc@npm:4.20.0" +"@rollup/rollup-win32-x64-msvc@npm:4.21.0": + version: 4.21.0 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.21.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@sindresorhus/is@npm:^4.6.0": - version: 4.6.0 - resolution: "@sindresorhus/is@npm:4.6.0" - checksum: 10c0/33b6fb1d0834ec8dd7689ddc0e2781c2bfd8b9c4e4bacbcb14111e0ae00621f2c264b8a7d36541799d74888b5dccdf422a891a5cb5a709ace26325eedc81e22e - languageName: node - linkType: hard - "@tsconfig/node18@npm:18.2.4": version: 18.2.4 resolution: "@tsconfig/node18@npm:18.2.4" @@ -744,16 +737,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*": - version: 22.2.0 - resolution: "@types/node@npm:22.2.0" - dependencies: - undici-types: "npm:~6.13.0" - checksum: 10c0/c17900b34faecfec204f72970bd658d0c217aaf739c1bf7690c969465b6b26b77a8be1cd9ba735aadbd1dd20b5c3e4f406ec33528bf7c6eec90744886c5d5608 - languageName: node - linkType: hard - -"@types/node@npm:22.5.0": +"@types/node@npm:*, @types/node@npm:22.5.0": version: 22.5.0 resolution: "@types/node@npm:22.5.0" dependencies: @@ -1081,13 +1065,6 @@ __metadata: languageName: node linkType: hard -"char-regex@npm:^1.0.2": - version: 1.0.2 - resolution: "char-regex@npm:1.0.2" - checksum: 10c0/57a09a86371331e0be35d9083ba429e86c4f4648ecbe27455dbfb343037c16ee6fdc7f6b61f433a57cc5ded5561d71c56a150e018f40c2ffb7bc93a26dae341e - languageName: node - linkType: hard - "check-error@npm:^2.1.1": version: 2.1.1 resolution: "check-error@npm:2.1.1" @@ -1194,7 +1171,7 @@ __metadata: languageName: node linkType: hard -"consola@npm:^3.2.3": +"consola@npm:3.2.3, consola@npm:^3.2.3": version: 3.2.3 resolution: "consola@npm:3.2.3" checksum: 10c0/c606220524ec88a05bb1baf557e9e0e04a0c08a9c35d7a08652d99de195c4ddcb6572040a7df57a18ff38bbc13ce9880ad032d56630cef27bef72768ef0ac078 @@ -1292,13 +1269,6 @@ __metadata: languageName: node linkType: hard -"emojilib@npm:^2.4.0": - version: 2.4.0 - resolution: "emojilib@npm:2.4.0" - checksum: 10c0/6e66ba8921175842193f974e18af448bb6adb0cf7aeea75e08b9d4ea8e9baba0e4a5347b46ed901491dcaba277485891c33a8d70b0560ca5cc9672a94c21ab8f - languageName: node - linkType: hard - "encoding@npm:^0.1.13": version: 0.1.13 resolution: "encoding@npm:0.1.13" @@ -1419,33 +1389,33 @@ __metadata: linkType: hard "esbuild@npm:^0.23.0": - version: 0.23.0 - resolution: "esbuild@npm:0.23.0" - dependencies: - "@esbuild/aix-ppc64": "npm:0.23.0" - "@esbuild/android-arm": "npm:0.23.0" - "@esbuild/android-arm64": "npm:0.23.0" - "@esbuild/android-x64": "npm:0.23.0" - "@esbuild/darwin-arm64": "npm:0.23.0" - "@esbuild/darwin-x64": "npm:0.23.0" - "@esbuild/freebsd-arm64": "npm:0.23.0" - "@esbuild/freebsd-x64": "npm:0.23.0" - "@esbuild/linux-arm": "npm:0.23.0" - "@esbuild/linux-arm64": "npm:0.23.0" - "@esbuild/linux-ia32": "npm:0.23.0" - "@esbuild/linux-loong64": "npm:0.23.0" - "@esbuild/linux-mips64el": "npm:0.23.0" - "@esbuild/linux-ppc64": "npm:0.23.0" - "@esbuild/linux-riscv64": "npm:0.23.0" - "@esbuild/linux-s390x": "npm:0.23.0" - "@esbuild/linux-x64": "npm:0.23.0" - "@esbuild/netbsd-x64": "npm:0.23.0" - "@esbuild/openbsd-arm64": "npm:0.23.0" - "@esbuild/openbsd-x64": "npm:0.23.0" - "@esbuild/sunos-x64": "npm:0.23.0" - "@esbuild/win32-arm64": "npm:0.23.0" - "@esbuild/win32-ia32": "npm:0.23.0" - "@esbuild/win32-x64": "npm:0.23.0" + version: 0.23.1 + resolution: "esbuild@npm:0.23.1" + dependencies: + "@esbuild/aix-ppc64": "npm:0.23.1" + "@esbuild/android-arm": "npm:0.23.1" + "@esbuild/android-arm64": "npm:0.23.1" + "@esbuild/android-x64": "npm:0.23.1" + "@esbuild/darwin-arm64": "npm:0.23.1" + "@esbuild/darwin-x64": "npm:0.23.1" + "@esbuild/freebsd-arm64": "npm:0.23.1" + "@esbuild/freebsd-x64": "npm:0.23.1" + "@esbuild/linux-arm": "npm:0.23.1" + "@esbuild/linux-arm64": "npm:0.23.1" + "@esbuild/linux-ia32": "npm:0.23.1" + "@esbuild/linux-loong64": "npm:0.23.1" + "@esbuild/linux-mips64el": "npm:0.23.1" + "@esbuild/linux-ppc64": "npm:0.23.1" + "@esbuild/linux-riscv64": "npm:0.23.1" + "@esbuild/linux-s390x": "npm:0.23.1" + "@esbuild/linux-x64": "npm:0.23.1" + "@esbuild/netbsd-x64": "npm:0.23.1" + "@esbuild/openbsd-arm64": "npm:0.23.1" + "@esbuild/openbsd-x64": "npm:0.23.1" + "@esbuild/sunos-x64": "npm:0.23.1" + "@esbuild/win32-arm64": "npm:0.23.1" + "@esbuild/win32-ia32": "npm:0.23.1" + "@esbuild/win32-x64": "npm:0.23.1" dependenciesMeta: "@esbuild/aix-ppc64": optional: true @@ -1497,7 +1467,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 10c0/08c148c067795165798c0467ce02d2d1ecedc096989bded5f0d795c61a1fcbec6c14d0a3c9f4ad6185cc29ec52087acaa335ed6d98be6ad57f7fa4264626bde0 + checksum: 10c0/08c2ed1105cc3c5e3a24a771e35532fe6089dd24a39c10097899072cef4a99f20860e41e9294e000d86380f353b04d8c50af482483d7f69f5208481cce61eec7 languageName: node linkType: hard @@ -1935,11 +1905,11 @@ __metadata: linkType: hard "is-core-module@npm:^2.13.0": - version: 2.15.0 - resolution: "is-core-module@npm:2.15.0" + version: 2.15.1 + resolution: "is-core-module@npm:2.15.1" dependencies: hasown: "npm:^2.0.2" - checksum: 10c0/da161f3d9906f459486da65609b2f1a2dfdc60887c689c234d04e88a062cb7920fa5be5fb7ab08dc43b732929653c4135ef05bf77888ae2a9040ce76815eb7b1 + checksum: 10c0/53432f10c69c40bfd2fa8914133a68709ff9498c86c3bf5fca3cdf3145a56fd2168cbf4a43b29843a6202a120a5f9c5ffba0a4322e1e3441739bc0b641682612 languageName: node linkType: hard @@ -2346,18 +2316,6 @@ __metadata: languageName: node linkType: hard -"node-emoji@npm:^2.1.3": - version: 2.1.3 - resolution: "node-emoji@npm:2.1.3" - dependencies: - "@sindresorhus/is": "npm:^4.6.0" - char-regex: "npm:^1.0.2" - emojilib: "npm:^2.4.0" - skin-tone: "npm:^2.0.0" - checksum: 10c0/e688333373563aa8308df16111eee2b5837b53a51fb63bf8b7fbea2896327c5d24c9984eb0c8ca6ac155d4d9c194dcf1840d271033c1b588c7c45a3b65339ef7 - languageName: node - linkType: hard - "node-fetch-h2@npm:^2.3.0": version: 2.3.0 resolution: "node-fetch-h2@npm:2.3.0" @@ -2685,7 +2643,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.40": +"postcss@npm:^8.4.41": version: 8.4.41 resolution: "postcss@npm:8.4.41" dependencies: @@ -2829,26 +2787,26 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^4.13.0, rollup@npm:^4.19.0": - version: 4.20.0 - resolution: "rollup@npm:4.20.0" - dependencies: - "@rollup/rollup-android-arm-eabi": "npm:4.20.0" - "@rollup/rollup-android-arm64": "npm:4.20.0" - "@rollup/rollup-darwin-arm64": "npm:4.20.0" - "@rollup/rollup-darwin-x64": "npm:4.20.0" - "@rollup/rollup-linux-arm-gnueabihf": "npm:4.20.0" - "@rollup/rollup-linux-arm-musleabihf": "npm:4.20.0" - "@rollup/rollup-linux-arm64-gnu": "npm:4.20.0" - "@rollup/rollup-linux-arm64-musl": "npm:4.20.0" - "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.20.0" - "@rollup/rollup-linux-riscv64-gnu": "npm:4.20.0" - "@rollup/rollup-linux-s390x-gnu": "npm:4.20.0" - "@rollup/rollup-linux-x64-gnu": "npm:4.20.0" - "@rollup/rollup-linux-x64-musl": "npm:4.20.0" - "@rollup/rollup-win32-arm64-msvc": "npm:4.20.0" - "@rollup/rollup-win32-ia32-msvc": "npm:4.20.0" - "@rollup/rollup-win32-x64-msvc": "npm:4.20.0" +"rollup@npm:^4.19.0, rollup@npm:^4.20.0": + version: 4.21.0 + resolution: "rollup@npm:4.21.0" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.21.0" + "@rollup/rollup-android-arm64": "npm:4.21.0" + "@rollup/rollup-darwin-arm64": "npm:4.21.0" + "@rollup/rollup-darwin-x64": "npm:4.21.0" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.21.0" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.21.0" + "@rollup/rollup-linux-arm64-gnu": "npm:4.21.0" + "@rollup/rollup-linux-arm64-musl": "npm:4.21.0" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.21.0" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.21.0" + "@rollup/rollup-linux-s390x-gnu": "npm:4.21.0" + "@rollup/rollup-linux-x64-gnu": "npm:4.21.0" + "@rollup/rollup-linux-x64-musl": "npm:4.21.0" + "@rollup/rollup-win32-arm64-msvc": "npm:4.21.0" + "@rollup/rollup-win32-ia32-msvc": "npm:4.21.0" + "@rollup/rollup-win32-x64-msvc": "npm:4.21.0" "@types/estree": "npm:1.0.5" fsevents: "npm:~2.3.2" dependenciesMeta: @@ -2888,7 +2846,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 10c0/9b23bf0e3380e64573a5f68a55274d5c7969036e55c19aab9fb4deea2e938d76769db70f3c95ee3783c24af152bea1772ad73f9e3625b6ffd4e600a788fe97ea + checksum: 10c0/984beb858da245c5e3a9027d6d87e67ad6443f1b46eab07685b861d9e49da5856693265c62a6f8262c36d11c9092713a96a9124f43e6de6698eb84d77118496a languageName: node linkType: hard @@ -3035,15 +2993,6 @@ __metadata: languageName: node linkType: hard -"skin-tone@npm:^2.0.0": - version: 2.0.0 - resolution: "skin-tone@npm:2.0.0" - dependencies: - unicode-emoji-modifier-base: "npm:^1.0.0" - checksum: 10c0/82d4c2527864f9cbd6cb7f3c4abb31e2224752234d5013b881d3e34e9ab543545b05206df5a17d14b515459fcb265ce409f9cfe443903176b0360cd20e4e4ba5 - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -3234,13 +3183,13 @@ __metadata: "@types/swagger-schema-official": "npm:^2.0.25" "@types/swagger2openapi": "npm:7.0.4" axios: "npm:1.7.5" + consola: "npm:3.2.3" cosmiconfig: "npm:^9.0.0" didyoumean: "npm:^1.2.2" eta: "npm:^2.2.0" js-yaml: "npm:^4.1.0" lodash: "npm:^4.17.21" nanoid: "npm:^3.3.7" - node-emoji: "npm:^2.1.3" prettier: "npm:~3.3.3" shx: "npm:0.3.4" swagger-schema-official: "npm:2.0.0-bab6bed" @@ -3317,9 +3266,9 @@ __metadata: linkType: hard "tinypool@npm:^1.0.0": - version: 1.0.0 - resolution: "tinypool@npm:1.0.0" - checksum: 10c0/71b20b9c54366393831c286a0772380c20f8cad9546d724c484edb47aea3228f274c58e98cf51d28c40869b39f5273209ef3ea94a9d2a23f8b292f4731cd3e4e + version: 1.0.1 + resolution: "tinypool@npm:1.0.1" + checksum: 10c0/90939d6a03f1519c61007bf416632dc1f0b9c1a9dd673c179ccd9e36a408437384f984fc86555a5d040d45b595abc299c3bb39d354439e98a090766b5952e73d languageName: node linkType: hard @@ -3439,24 +3388,10 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~6.13.0": - version: 6.13.0 - resolution: "undici-types@npm:6.13.0" - checksum: 10c0/2de55181f569c77a4f08063f8bf2722fcbb6ea312a26a9e927bd1f5ea5cf3a281c5ddf23155061db083e0a25838f54813543ff13b0ac34d230d5c1205ead66c1 - languageName: node - linkType: hard - "undici-types@npm:~6.19.2": - version: 6.19.6 - resolution: "undici-types@npm:6.19.6" - checksum: 10c0/9b2264c5700e7169c6c62c643aac56cd8984c5fd7e18ed31ff11780260e137f6340dee8317a2e6e0ae3c49f5e5ef6fa577ea07193cbaa535265cba76a267cae9 - languageName: node - linkType: hard - -"unicode-emoji-modifier-base@npm:^1.0.0": - version: 1.0.0 - resolution: "unicode-emoji-modifier-base@npm:1.0.0" - checksum: 10c0/b37623fcf0162186debd20f116483e035a2d5b905b932a2c472459d9143d446ebcbefb2a494e2fe4fa7434355396e2a95ec3fc1f0c29a3bc8f2c827220e79c66 + version: 6.19.8 + resolution: "undici-types@npm:6.19.8" + checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344 languageName: node linkType: hard @@ -3494,13 +3429,13 @@ __metadata: linkType: hard "vite@npm:^5.0.0": - version: 5.4.0 - resolution: "vite@npm:5.4.0" + version: 5.4.2 + resolution: "vite@npm:5.4.2" dependencies: esbuild: "npm:^0.21.3" fsevents: "npm:~2.3.3" - postcss: "npm:^8.4.40" - rollup: "npm:^4.13.0" + postcss: "npm:^8.4.41" + rollup: "npm:^4.20.0" peerDependencies: "@types/node": ^18.0.0 || >=20.0.0 less: "*" @@ -3532,7 +3467,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 10c0/122de7795e1c3c08cd0acc7d77296f908398266b424492be7310400107f37a3cf4c9506f2b4b16619e57299ca2859b8ca187aac5e25f8e66d84f9204a1d72d18 + checksum: 10c0/23e347ca8aa6f0a774227e4eb7abae228f12c6806a727b046aa75e7ee37ffc2d68cff74360e12a42c347f79adc294e2363bc723b957bf4b382b5a8fb39e4df9d languageName: node linkType: hard