fix lint

Author: dummdidumm

packages/svelte/scripts/process-messages/templates/compile-errors.js

@@ -28,7 +28,7 @@ function e(node, code, message) {
 	throw new InternalCompileError(
 		code,
 		message,
-		start !== undefined && end !== undefined ? [start, end] : undefined
+		start !== undefined ? [start, end ?? start] : undefined
 	);
 }
 

packages/svelte/scripts/process-messages/templates/compile-warnings.js

@@ -29,7 +29,11 @@ function w(node, code, message) {
 	if (stack && stack.at(-1)?.has(code)) return;
 
 	warnings.push(
-		new InternalCompileWarning(code, message, node ? [node.start, node.end] : undefined)
+		new InternalCompileWarning(
+			code,
+			message,
+			node && node.start !== undefined ? [node.start, node.end ?? node.start] : undefined
+		)
 	);
 }
 

packages/svelte/src/compiler/errors.js

@@ -26,7 +26,7 @@ function e(node, code, message) {
 	const start = typeof node === 'number' ? node : node?.start;
 	const end = typeof node === 'number' ? node : node?.end;
 
-	throw new InternalCompileError(code, message, start !== undefined && end !== undefined ? [start, end] : undefined);
+	throw new InternalCompileError(code, message, start !== undefined ? [start, end ?? start] : undefined);
 }
 
 /**

packages/svelte/src/compiler/types/index.d.ts

@@ -11,8 +11,7 @@ import type { Context } from 'zimmerframe';
 import type { Scope } from '../phases/scope.js';
 import type { Css } from './css.js';
 import type { EachBlock, Namespace, SvelteNode, SvelteOptions } from './template.js';
-import type { InternalCompileError } from '../errors.js';
-import type { InternalCompileWarning } from '../warnings.js';
+import type { ICompileDiagnostic } from '../utils/compile_diagnostic.js';
 
 /** The return value of `compile` from `svelte/compiler` */
 export interface CompileResult {
@@ -51,9 +50,9 @@ export interface CompileResult {
 	ast: any;
 }
 
-export interface Warning extends InternalCompileWarning {}
+export interface Warning extends ICompileDiagnostic {}
 
-export interface CompileError extends InternalCompileError {}
+export interface CompileError extends ICompileDiagnostic {}
 
 export type CssHashGetter = (args: {
 	name: string;

packages/svelte/src/compiler/utils/compile_diagnostic.js

@@ -35,17 +35,20 @@ function get_code_frame(source, line, column) {
 		.join('\n');
 }
 
+/**
+ * @typedef {{
+ * 	code: string;
+ * 	message: string;
+ * 	filename?: string;
+ * 	start?: Location;
+ * 	end?: Location;
+ * 	position?: [number, number];
+ * 	frame?: string;
+ * }} ICompileDiagnostic */
+
+/** @implements {ICompileDiagnostic} */
 export class CompileDiagnostic extends Error {
 	name = 'CompileDiagnostic';
-	filename = state.filename;
-	/** @type {[number, number] | undefined} */
-	position = undefined;
-	/** @type {Location | undefined} */
-	start = undefined;
-	/** @type {Location | undefined} */
-	end = undefined;
-	/** @type {string | undefined} */
-	frame = undefined;
 
 	/**
 	 * @param {string} code
@@ -55,9 +58,13 @@ export class CompileDiagnostic extends Error {
 	constructor(code, message, position) {
 		super(message);
 		this.code = code;
-		this.position = position;
+
+		if (state.filename) {
+			this.filename = state.filename;
+		}
 
 		if (position) {
+			this.position = position;
 			this.start = state.locator(position[0]);
 			this.end = state.locator(position[1]);
 			if (this.start && this.end) {

packages/svelte/src/compiler/warnings.js

@@ -30,7 +30,7 @@ function w(node, code, message) {
 	}
 
 	if (stack && stack.at(-1)?.has(code)) return;
-	warnings.push(new InternalCompileWarning(code, message, node ? [node.start, node.end] : undefined));
+	warnings.push(new InternalCompileWarning(code, message, node && node.start !== undefined ? [node.start, node.end ?? node.start] : undefined));
 }
 
 export const codes = [

packages/svelte/types/index.d.ts

@@ -714,9 +714,9 @@ declare module 'svelte/compiler' {
 		ast: any;
 	}
 
-	export interface Warning extends InternalCompileWarning {}
+	export interface Warning extends ICompileDiagnostic {}
 
-	export interface CompileError extends InternalCompileError {}
+	export interface CompileError extends ICompileDiagnostic {}
 
 	type CssHashGetter = (args: {
 		name: string;
@@ -1875,33 +1875,15 @@ declare module 'svelte/compiler' {
 		content: Program;
 		attributes: Attribute[];
 	}
-	class InternalCompileError extends CompileDiagnostic {
-	}
-	class InternalCompileWarning extends CompileDiagnostic {
-	}
-	class CompileDiagnostic extends Error {
-		
-		constructor(code: string, message: string, position: [number, number] | undefined);
-		filename: string | undefined;
-		
-		position: [number, number] | undefined;
-		
-		start: Location | undefined;
-		
-		end: Location | undefined;
-		
-		frame: string | undefined;
+	type ICompileDiagnostic = {
 		code: string;
-		toJSON(): {
-			code: string;
-			message: string;
-			filename: string | undefined;
-			start: import("locate-character").Location_1 | undefined;
-			end: import("locate-character").Location_1 | undefined;
-			position: [number, number] | undefined;
-			frame: string | undefined;
-		};
-	}
+		message: string;
+		filename?: string;
+		start?: Location;
+		end?: Location;
+		position?: [number, number];
+		frame?: string;
+	};
 
 	export {};
 }
@@ -2547,7 +2529,7 @@ declare module 'svelte/types/compiler/interfaces' {
 	export type CompileOptions = CompileOptions_1;
 	/** @deprecated import this from 'svelte' instead */
 	export type Warning = Warning_1;
-	interface Warning_1 extends InternalCompileWarning {}
+	interface Warning_1 extends ICompileDiagnostic {}
 
 	type CssHashGetter = (args: {
 		name: string;
@@ -2710,31 +2692,15 @@ declare module 'svelte/types/compiler/interfaces' {
 	 *               (also see https://github.com/sveltejs/svelte/pull/5652)
 	 */
 	type Namespace = 'html' | 'svg' | 'mathml' | 'foreign';
-	class InternalCompileWarning extends CompileDiagnostic {
-	}
-	class CompileDiagnostic extends Error {
-		
-		constructor(code: string, message: string, position: [number, number] | undefined);
-		filename: string | undefined;
-		
-		position: [number, number] | undefined;
-		
-		start: Location | undefined;
-		
-		end: Location | undefined;
-		
-		frame: string | undefined;
+	type ICompileDiagnostic = {
 		code: string;
-		toJSON(): {
-			code: string;
-			message: string;
-			filename: string | undefined;
-			start: import("locate-character").Location_1 | undefined;
-			end: import("locate-character").Location_1 | undefined;
-			position: [number, number] | undefined;
-			frame: string | undefined;
-		};
-	}
+		message: string;
+		filename?: string;
+		start?: Location;
+		end?: Location;
+		position?: [number, number];
+		frame?: string;
+	};
 
 	export {};
 }declare module '*.svelte' {