From 67d7f102750e5a655a6a69a0bd04260e83bbb487 Mon Sep 17 00:00:00 2001 From: Vladislav Tupikin Date: Thu, 22 Feb 2024 09:31:23 +0400 Subject: [PATCH] Rename `getRollupEror` to `getRollupError` (#5398) --- scripts/generate-buffer-to-ast.js | 6 +++--- src/ast/nodes/PanicError.ts | 4 ++-- src/ast/nodes/ParseError.ts | 4 ++-- src/utils/bufferToAst.ts | 6 +++--- src/utils/logs.ts | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/generate-buffer-to-ast.js b/scripts/generate-buffer-to-ast.js index b43d4b2a89e..926784c5ecf 100644 --- a/scripts/generate-buffer-to-ast.js +++ b/scripts/generate-buffer-to-ast.js @@ -192,16 +192,16 @@ import { } from './astConverterHelpers'; import { FIXED_STRINGS } from './convert-ast-strings'; import type { ReadString } from './getReadStringFunction'; -import { error, getRollupEror, logParseError } from './logs'; +import { error, getRollupError, logParseError } from './logs'; export function convertProgram(buffer: ArrayBuffer, readString: ReadString): ProgramNode { const node = convertNode(0, new Uint32Array(buffer), readString); switch (node.type) { case PanicError: { - return error(getRollupEror(logParseError(node.message))); + return error(getRollupError(logParseError(node.message))); } case ParseError: { - return error(getRollupEror(logParseError(node.message, node.start))); + return error(getRollupError(logParseError(node.message, node.start))); } default: { return node; diff --git a/src/ast/nodes/PanicError.ts b/src/ast/nodes/PanicError.ts index f040c3ebc92..ef00c1ef623 100644 --- a/src/ast/nodes/PanicError.ts +++ b/src/ast/nodes/PanicError.ts @@ -1,4 +1,4 @@ -import { error, getRollupEror, logModuleParseError, logParseError } from '../../utils/logs'; +import { error, getRollupError, logModuleParseError, logParseError } from '../../utils/logs'; import type * as NodeType from './NodeType'; import { NodeBase } from './shared/Node'; @@ -10,7 +10,7 @@ export default class PanicError extends NodeBase { const id = this.scope.context.module.id; // This simulates the current nested error structure. We could also just // replace it with a flat error. - const parseError = getRollupEror(logParseError(this.message)); + const parseError = getRollupError(logParseError(this.message)); const moduleParseError = logModuleParseError(parseError, id); return error(moduleParseError); } diff --git a/src/ast/nodes/ParseError.ts b/src/ast/nodes/ParseError.ts index 5c0558507fd..2187a10c213 100644 --- a/src/ast/nodes/ParseError.ts +++ b/src/ast/nodes/ParseError.ts @@ -1,4 +1,4 @@ -import { getRollupEror, logModuleParseError, logParseError } from '../../utils/logs'; +import { getRollupError, logModuleParseError, logParseError } from '../../utils/logs'; import type * as NodeType from './NodeType'; import { NodeBase } from './shared/Node'; @@ -11,7 +11,7 @@ export default class ParseError extends NodeBase { const id = this.scope.context.module.id; // This simulates the current nested error structure. We could also just // replace it with a flat error. - const parseError = getRollupEror(logParseError(this.message, pos)); + const parseError = getRollupError(logParseError(this.message, pos)); const moduleParseError = logModuleParseError(parseError, id); this.scope.context.error(moduleParseError, pos); } diff --git a/src/utils/bufferToAst.ts b/src/utils/bufferToAst.ts index 0725ae87647..04c6520e53d 100644 --- a/src/utils/bufferToAst.ts +++ b/src/utils/bufferToAst.ts @@ -13,16 +13,16 @@ import { } from './astConverterHelpers'; import { FIXED_STRINGS } from './convert-ast-strings'; import type { ReadString } from './getReadStringFunction'; -import { error, getRollupEror, logParseError } from './logs'; +import { error, getRollupError, logParseError } from './logs'; export function convertProgram(buffer: ArrayBuffer, readString: ReadString): ProgramNode { const node = convertNode(0, new Uint32Array(buffer), readString); switch (node.type) { case PanicError: { - return error(getRollupEror(logParseError(node.message))); + return error(getRollupError(logParseError(node.message))); } case ParseError: { - return error(getRollupEror(logParseError(node.message, node.start))); + return error(getRollupError(logParseError(node.message, node.start))); } default: { return node; diff --git a/src/utils/logs.ts b/src/utils/logs.ts index 9fb3ee9661f..6570e7a4e76 100644 --- a/src/utils/logs.ts +++ b/src/utils/logs.ts @@ -33,10 +33,10 @@ import { } from './urls'; export function error(base: Error | RollupLog): never { - throw base instanceof Error ? base : getRollupEror(base); + throw base instanceof Error ? base : getRollupError(base); } -export function getRollupEror(base: RollupLog): Error & RollupLog { +export function getRollupError(base: RollupLog): Error & RollupLog { const errorInstance = Object.assign(new Error(base.message), base); Object.defineProperty(errorInstance, 'name', { value: 'RollupError', writable: true }); return errorInstance;