Fix: Top-of-file Comments get duplicated when moving runtime code #87 (…

…#88)

Fixes #87

---------

Co-authored-by: Ian VanSchooten <ian.vanschooten@gmail.com>

src/utils/get-all-comments-from-nodes.ts

@@ -2,13 +2,19 @@ import type {
     CommentBlock,
     CommentLine,
     Directive,
+    InterpreterDirective,
     Statement,
 } from '@babel/types';
 
 import { SomeSpecifier } from '../types';
 
 export const getAllCommentsFromNodes = (
-    nodes: readonly (Directive | Statement | SomeSpecifier)[],
+    nodes: readonly (
+        | Directive
+        | Statement
+        | SomeSpecifier
+        | InterpreterDirective
+    )[],
 ) =>
     nodes.reduce((acc, node) => {
         if (

src/utils/get-code-from-ast.ts

@@ -35,12 +35,16 @@ export const getCodeFromAst = ({
 }) => {
     const allCommentsFromImports = getAllCommentsFromNodes(nodesToOutput);
     const allCommentsFromDirectives = getAllCommentsFromNodes(directives);
+    const allCommentsFromIntrepter = interpreter
+        ? getAllCommentsFromNodes([interpreter])
+        : [];
 
     const nodesToRemoveFromCode = [
         ...nodesToOutput,
         ...allOriginalImportNodes,
         ...allCommentsFromImports,
         ...allCommentsFromDirectives,
+        ...allCommentsFromIntrepter,
         ...(interpreter ? [interpreter] : []),
         ...directives,
     ];

tests/ImportCommentsNoDuplicate/__snapshots__/ppsi.spec.ts.snap

@@ -0,0 +1,26 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`trailing-comments-on-interpreter.ts - typescript-verify > trailing-comments-on-interpreter.ts 1`] = `
+#!/usr/bin/env ts-node
+// ################################################
+// ## Highlander comment: There can only be one! ##
+// ################################################
+
+const someRandomGlobal = "stuff";
+
+import * as fs from "fs";
+import * as path from "path";
+import shell from "shelljs";
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#!/usr/bin/env ts-node
+// ################################################
+// ## Highlander comment: There can only be one! ##
+// ################################################
+import * as fs from "fs";
+import * as path from "path";
+import shell from "shelljs";
+
+const someRandomGlobal = "stuff";
+
+`;

tests/ImportCommentsNoDuplicate/ppsi.spec.ts

@@ -0,0 +1,5 @@
+import {run_spec} from '../../test-setup/run_spec';
+
+run_spec(__dirname, ["typescript"], {
+    importOrderParserPlugins : ['typescript']
+});

tests/ImportCommentsNoDuplicate/trailing-comments-on-interpreter.ts

@@ -0,0 +1,11 @@
+#!/usr/bin/env ts-node
+// ################################################
+// ## Highlander comment: There can only be one! ##
+// ################################################
+
+const someRandomGlobal = "stuff";
+
+import * as fs from "fs";
+import * as path from "path";
+import shell from "shelljs";
+