Skip to content
Open
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
4 changes: 3 additions & 1 deletion src/common/jsdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,15 @@ export namespace JsDoc {
return yield* ParseContent(rest)
}
for (let i = 0; i < content.length; i++) {
if (content[i] === '\n' || content[i] === '-') {
if (content[i] === '\n' || (content[i] === '-' && i > 0)) {
const value = content.slice(0, i).trim()
const rest = content.slice(i)
yield [key, Decode(value)]
return yield* ParseContent(rest)
}
}
// If we reach the end without finding a delimiter, yield the entire content
yield [key, Decode(content.trim())]
}
function* ParseKey(content: string): IterableIterator<[string, any]> {
for (let i = 1; i < content.length; i++) {
Expand Down
42 changes: 42 additions & 0 deletions test/ts2typebox/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -575,5 +575,47 @@ describe('ts2typebox - Typescript to Typebox', () => {
`
expectEqualIgnoreFormatting(generatedTypebox, expectedResult)
})
test('negative numbers in jsdoc tags', () => {
const generatedTypebox = TypeScriptToTypeBox.Generate(`
/**
* @minimum -10
* @maximum -5
* @default -7
*/
type T = number;
`)
const expectedResult = `
import { Type, Static } from "@sinclair/typebox";

type T = Static<typeof T>;
const T = Type.Number({ minimum: -10, maximum: -5, default: -7 });
`
expectEqualIgnoreFormatting(generatedTypebox, expectedResult)
})
test('negative numbers with description and dash comment', () => {
const generatedTypebox = TypeScriptToTypeBox.Generate(`
type T = {
/**
* @minimum -10
* @maximum -5
* @description "A negative range" - this is a comment
*/
value: number;
}
`)
const expectedResult = `
import { Type, Static } from "@sinclair/typebox";

type T = Static<typeof T>;
const T = Type.Object({
value: Type.Number({
minimum: -10,
maximum: -5,
description: "A negative range",
}),
});
`
expectEqualIgnoreFormatting(generatedTypebox, expectedResult)
})
})
})