Fix that comments of variable declaration are not emitted; Bump self …

…to 1.2.2
shrinktofit · Dec 11, 2019 · 55fa369 · 55fa369
1 parent 270a37c
commit 55fa369
Show file tree

Hide file tree

Showing 5 changed files with 413 additions and 5 deletions.
diff --git a/build/gift.js b/build/gift.js
diff --git a/build/gift.js.map b/build/gift.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "tfig",
- "version": "1.2.1",
+ "version": "1.2.2",
  "description": "Yet another tool to generate .d.ts bundle.",
  "main": "build/gift.js",
  "types": "build/gift.d.ts",

diff --git a/source/gift.ts b/source/gift.ts
@@ -414,9 +414,15 @@ class BundleGenerator {
  return result;
  }
 
- private _copyComments<T extends ts.Node>(src: ts.Node, dst: T) {
+ private _copyComments<T extends ts.Node>(src: ts.Node, dst: T): T {
+ if (ts.isVariableDeclaration(src) &&
+ ts.isVariableDeclarationList(src.parent) &&
+ ts.isVariableStatement(src.parent.parent)) {
+ // https://github.com/microsoft/TypeScript/issues/35620
+ return this._copyComments(src.parent.parent, dst);
+ }
  const sourceFileText = src.getSourceFile().text;
- ts.forEachLeadingCommentRange(sourceFileText, src.getFullStart(), (pos, end, kind) => {
+ ts.forEachLeadingCommentRange(sourceFileText, src.pos, (pos, end, kind) => {
  let tex = sourceFileText.substring(pos, end);
  if (tex.startsWith('/*')) {
  tex = tex.substr(2, tex.length - 4);