Skip to content

Commit e43ceef

Browse files
authored
fix: preserve zero-valued custom renderer results (#4162)
Assisted-by: OpenAI GPT-6 <[email protected]>
1 parent e7dcf52 commit e43ceef

2 files changed

Lines changed: 34 additions & 4 deletions

File tree

‎src/Instance.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type { Token, Tokens, TokensList } from './Tokens.ts';
1212
export type MaybePromise = void | Promise<void>;
1313

1414
type UnknownFunction = (...args: unknown[]) => unknown;
15-
type GenericRendererFunction = (...args: unknown[]) => string | false;
15+
type GenericRendererFunction<RendererOutput> = (...args: unknown[]) => RendererOutput | false;
1616

1717
/**
1818
* Append value(s) to values in place, flattening one level like concat
@@ -184,15 +184,15 @@ export class Marked<ParserOutput = string, RendererOutput = string> {
184184
continue;
185185
}
186186
const rendererProp = prop as Exclude<keyof _Renderer<ParserOutput, RendererOutput>, 'options' | 'parser'>;
187-
const rendererFunc = pack.renderer[rendererProp] as GenericRendererFunction;
188-
const prevRenderer = renderer[rendererProp] as GenericRendererFunction;
187+
const rendererFunc = pack.renderer[rendererProp] as GenericRendererFunction<RendererOutput>;
188+
const prevRenderer = renderer[rendererProp] as GenericRendererFunction<RendererOutput>;
189189
// Replace renderer with func to run extension, but fall back if false
190190
renderer[rendererProp] = (...args: unknown[]) => {
191191
let ret = rendererFunc.apply(renderer, args);
192192
if (ret === false) {
193193
ret = prevRenderer.apply(renderer, args);
194194
}
195-
return (ret || '') as RendererOutput;
195+
return (ret === false ? '' : ret ?? '') as RendererOutput;
196196
};
197197
}
198198
opts.renderer = renderer;

‎test/unit/instance.test.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,36 @@ describe('Marked', () => {
2727
assert.strictEqual(marked.parse('# header'), '<h1>header</h1>\n');
2828
});
2929

30+
for (const fallback of [false, true]) {
31+
it(`should preserve a numeric renderer result through a custom parser${fallback ? ' after falling back' : ''}`, () => {
32+
const instance = new Marked({
33+
renderer: {
34+
code({ text }) {
35+
return text.length;
36+
},
37+
},
38+
hooks: {
39+
provideParser() {
40+
return (tokens, options) => options.renderer.code(tokens[0]);
41+
},
42+
},
43+
});
44+
if (fallback) {
45+
instance.use({ renderer: { code: () => false } });
46+
}
47+
48+
assert.strictEqual(instance.parse('```\n```'), 0);
49+
assert.strictEqual(instance.parse('```\nabc\n```'), 3);
50+
});
51+
}
52+
53+
for (const result of [null, undefined]) {
54+
it(`should still suppress ${result} renderer output`, () => {
55+
const instance = new Marked({ renderer: { code: () => result } });
56+
assert.strictEqual(instance.parse('```\n```'), '');
57+
});
58+
}
59+
3060
it('should work with use', () => {
3161
const marked1 = new Marked();
3262
marked1.use({

0 commit comments

Comments
 (0)