Skip to content

Commit bc34862

Browse files
authored
[fix] update preprocessor types (#6904)
1 parent fe39272 commit bc34862

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/compiler/preprocess/index.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PreprocessResult implements Source {
3030

3131
get_location: ReturnType<typeof getLocator>;
3232

33-
constructor(public source: string, public filename: string) {
33+
constructor(public source: string, public filename?: string) {
3434
this.update_source({ string: source });
3535

3636
// preprocess source must be relative to itself or equal null
@@ -179,10 +179,10 @@ async function process_tag(
179179
return { string, map, dependencies };
180180
}
181181

182-
async function process_markup(filename: string, process: MarkupPreprocessor, source: Source) {
182+
async function process_markup(process: MarkupPreprocessor, source: Source) {
183183
const processed = await process({
184184
content: source.source,
185-
filename
185+
filename: source.filename
186186
});
187187

188188
if (processed) {
@@ -206,8 +206,7 @@ export default async function preprocess(
206206
preprocessor: PreprocessorGroup | PreprocessorGroup[],
207207
options?: { filename?: string }
208208
): Promise<Processed> {
209-
// @ts-ignore todo: doublecheck
210-
const filename = (options && options.filename) || preprocessor.filename; // legacy
209+
const filename: string | undefined = (options && options.filename) || (preprocessor as any).filename; // legacy
211210

212211
const preprocessors = preprocessor ? (Array.isArray(preprocessor) ? preprocessor : [preprocessor]) : [];
213212

@@ -221,7 +220,7 @@ export default async function preprocess(
221220
// to make debugging easier = detect low-resolution sourcemaps in fn combine_mappings
222221

223222
for (const process of markup) {
224-
result.update_source(await process_markup(filename, process, result));
223+
result.update_source(await process_markup(process, result));
225224
}
226225

227226
for (const process of script) {

src/compiler/preprocess/types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export interface Source {
77
source: string;
88
get_location: (search: number) => Location;
99
file_basename: string;
10-
filename: string;
10+
filename?: string;
1111
}
1212

1313
export interface Processed {
@@ -19,8 +19,8 @@ export interface Processed {
1919

2020
export type MarkupPreprocessor = (options: {
2121
content: string;
22-
filename: string;
23-
}) => Processed | Promise<Processed>;
22+
filename?: string;
23+
}) => Processed | void | Promise<Processed | void>;
2424

2525
export type Preprocessor = (options: {
2626
/**
@@ -33,7 +33,7 @@ export type Preprocessor = (options: {
3333
*/
3434
markup: string;
3535
filename?: string;
36-
}) => Processed | Promise<Processed>;
36+
}) => Processed | void | Promise<Processed | void>;
3737

3838
export interface PreprocessorGroup {
3939
markup?: MarkupPreprocessor;

0 commit comments

Comments
 (0)