Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions apps/oxlint/src-js/plugins/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { Fix, FixFn } from './fix.ts';
import type { SourceCode } from './source_code.ts';
import type { Location, Ranged } from './types.ts';

const { hasOwn } = Object;
const { hasOwn, keys: ObjectKeys } = Object;

// Diagnostic in form passed by user to `Context#report()`
export type Diagnostic = DiagnosticWithNode | DiagnosticWithLoc | DiagnosticWithMessageId;
Expand Down Expand Up @@ -161,8 +161,7 @@ export class Context {
// Resolve message from messageId if present
let message: string;
if (hasOwn(diagnostic, 'messageId')) {
const diagWithMessageId = diagnostic as DiagnosticWithMessageId;
message = resolveMessage(diagWithMessageId.messageId, internal);
message = resolveMessage((diagnostic as DiagnosticWithMessageId).messageId, internal);
} else {
message = diagnostic.message;
if (typeof message !== 'string') {
Expand Down Expand Up @@ -249,15 +248,14 @@ export class Context {
*/
function resolveMessage(messageId: string, internal: InternalContext): string {
const { messages } = internal;

if (!messages) {
if (messages === null) {
throw new Error(`Cannot use messageId '${messageId}' - rule does not define any messages in meta.messages`);
}

if (!hasOwn(messages, messageId)) {
throw new Error(
`Unknown messageId '${messageId}'. Available messages: ${
Object.keys(messages).map((msg) => `'${msg}'`).join(', ')
ObjectKeys(messages).map((msg) => `'${msg}'`).join(', ')
}`,
);
}
Expand Down
9 changes: 4 additions & 5 deletions apps/oxlint/src-js/plugins/load.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,10 @@ async function loadPluginImpl(path: string): Promise<PluginDetails> {
}

// Extract messages for messageId support
if (ruleMeta.messages != null) {
if (typeof ruleMeta.messages !== 'object' || Array.isArray(ruleMeta.messages)) {
throw new TypeError('Invalid `meta.messages` - must be an object');
}
messages = ruleMeta.messages;
const inputMessages = ruleMeta.messages;
if (inputMessages != null) {
if (typeof inputMessages !== 'object') throw new TypeError('`meta.messages` must be an object if provided');
messages = inputMessages;
}
}

Expand Down
Loading