From 573b0d0d89064d437746c066ae5a0f7982eccf05 Mon Sep 17 00:00:00 2001 From: FlashHit <56718716+FlashHit@users.noreply.github.com> Date: Fri, 27 May 2022 01:09:04 +0200 Subject: [PATCH 1/4] fix: add support for nestedTable and nestedArray --- src/stub-gen/generator.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/stub-gen/generator.ts b/src/stub-gen/generator.ts index a902976..a19c247 100644 --- a/src/stub-gen/generator.ts +++ b/src/stub-gen/generator.ts @@ -139,9 +139,9 @@ function generateDocParam(name: string, p: IDocParam) { } else if (p.table) { code += `${_LT(p.type)}[]`; // Lua table } else if (p.nestedArray) { - // TODO: Implement + code += `vector|table`; // nestedArray } else if (p.nestedTable) { - // TODO: Implement + code += `table`; // nestedTable } else { code += `${_LT(p.type)}`; } @@ -178,9 +178,9 @@ function generateDocReturn(returns: IDocType | IDocType[], comments?: string[]) } else if (r.table) { code += `${_LT(r.type)}[]`; // Lua table } else if (r.nestedArray) { - // TODO: Implement + code += `vector|table`; // nestedArray } else if (r.nestedTable) { - // TODO: Implement + code += `table`; // nestedTable } else { code += `${_LT(r.type)}`; } From e27cca838284fc8a23cab779c5f0a698e2c8f2d5 Mon Sep 17 00:00:00 2001 From: FlashHit <56718716+FlashHit@users.noreply.github.com> Date: Fri, 27 May 2022 01:13:18 +0200 Subject: [PATCH 2/4] fix: fix optional parameters --- src/stub-gen/generator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stub-gen/generator.ts b/src/stub-gen/generator.ts index a19c247..8f15e95 100644 --- a/src/stub-gen/generator.ts +++ b/src/stub-gen/generator.ts @@ -146,7 +146,7 @@ function generateDocParam(name: string, p: IDocParam) { code += `${_LT(p.type)}`; } - if (p.nullable) { + if (p.nullable || p.default) { code += '|nil'; } } From cfbd5b47a48fbbeadc1bc7cb7e6adc7a6dbe470f Mon Sep 17 00:00:00 2001 From: FlashHit <56718716+FlashHit@users.noreply.github.com> Date: Fri, 27 May 2022 01:23:05 +0200 Subject: [PATCH 3/4] fix: add support for nestedTable and nestedArray --- src/stub-gen/generator.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stub-gen/generator.ts b/src/stub-gen/generator.ts index 8f15e95..5816701 100644 --- a/src/stub-gen/generator.ts +++ b/src/stub-gen/generator.ts @@ -108,9 +108,9 @@ function generateDocProperty(name: string, p: IDocProperty, comments?: string[]) } else if (p.table) { code += `${_LT(p.type)}[]`; // Lua table } else if (p.nestedArray) { - // TODO: Implement + code += `vector|table`; // nestedArray } else if (p.nestedTable) { - // TODO: Implement + code += `table`; // nestedTable } else { code += `${_LT(p.type)}`; } From 29900cc8d9ad62cf8bd8170cb81af7e8523428f3 Mon Sep 17 00:00:00 2001 From: FlashHit <56718716+FlashHit@users.noreply.github.com> Date: Fri, 27 May 2022 01:25:36 +0200 Subject: [PATCH 4/4] fix: wrong var --- src/stub-gen/generator.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stub-gen/generator.ts b/src/stub-gen/generator.ts index 5816701..b809f3f 100644 --- a/src/stub-gen/generator.ts +++ b/src/stub-gen/generator.ts @@ -178,9 +178,9 @@ function generateDocReturn(returns: IDocType | IDocType[], comments?: string[]) } else if (r.table) { code += `${_LT(r.type)}[]`; // Lua table } else if (r.nestedArray) { - code += `vector|table`; // nestedArray + code += `vector|table`; // nestedArray } else if (r.nestedTable) { - code += `table`; // nestedTable + code += `table`; // nestedTable } else { code += `${_LT(r.type)}`; }