lib/printer.ts

@@ -930,7 +930,7 @@ function genericPrintNoParens(path: any, options: any, print: any) {
 
     case "StringLiteral":
         return fromString(nodeStr(n.value, options));
-    
+
     case "BooleanLiteral": // Babel 6 Literal split
     case "Literal":
       return fromString(
@@ -2194,13 +2194,20 @@ function genericPrintNoParens(path: any, options: any, print: any) {
       ]);
 
     case "TSTypeLiteral": {
-      const memberLines = fromString("\n").join(path.map(print, "members"));
+      const members = fromString("\n").join(
+        path.map(print, "members").map((member: Lines) => {
+          if (lastNonSpaceCharacter(member) !== ";") {
+            return member.concat(";");
+          }
+          return member;
+        })
+      );
 
-      if (memberLines.isEmpty()) {
+      if (members.isEmpty()) {
         return fromString("{}", options);
       }
 
-      parts.push("{\n", memberLines.indent(options.tabWidth), "\n}");
+      parts.push("{\n", members.indent(options.tabWidth), "\n}");
 
       return concat(parts);
     }
@@ -2421,7 +2428,14 @@ function genericPrintNoParens(path: any, options: any, print: any) {
       ]);
 
     case "TSInterfaceBody": {
-      const lines = fromString("\n").join(path.map(print, "body"));
+      const lines = fromString("\n").join(
+        path.map(print, "body").map((element: Lines) => {
+          if (lastNonSpaceCharacter(element) !== ";") {
+            return element.concat(";");
+          }
+          return element;
+        })
+      );
       if (lines.isEmpty()) {
         return fromString("{}", options);
       }

package.json

@@ -1,7 +1,7 @@
 {
   "author": "Ben Newman <bn@cs.stanford.edu>",
   "name": "recast",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "JavaScript syntax tree transformer, nondestructive pretty-printer, and automatic source map generator",
   "keywords": [
     "ast",

test/typescript.ts

@@ -44,8 +44,8 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
       "type I = intrinsic;",
       "",
       "type J = {",
-      "  a: string",
-      "  b?: number",
+      "  a: string;",
+      "  b?: number;",
       "};",
     ]);
 
@@ -60,19 +60,19 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
 
     check([
       "type A<T, U> = {",
-      '  u: "cat"',
-      "  x: number",
-      "  y: T",
-      "  z: U",
+      '  u: "cat";',
+      "  x: number;",
+      "  y: T;",
+      "  z: U;",
       "};",
     ]);
 
     check([
       "type F = <T, U>(",
       "  a: string,",
       "  b: {",
-      "    y: T",
-      "    z: U",
+      "    y: T;",
+      "    z: U;",
       "  }",
       ") => void;",
     ]);
@@ -131,7 +131,7 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
       "",
       "function create<T>(",
       "  c: {",
-      "    new<U>(a: U): T",
+      "    new<U>(a: U): T;",
       "  }",
       "): void {}",
     ]);
@@ -213,23 +213,23 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
 
     check([
       "interface LabelledContainer<T> {",
-      "  label: string",
-      "  content: T",
-      "  option?: boolean",
-      "  readonly x: number",
-      "  [index: number]: string",
-      "  [propName: string]: any",
-      "  readonly [index: number]: string",
-      "  (source: string, subString: string): boolean",
-      "  (start: number): string",
-      "  reset(): void",
-      "  a(c: (this: void, e: E) => void): void",
+      "  label: string;",
+      "  content: T;",
+      "  option?: boolean;",
+      "  readonly x: number;",
+      "  [index: number]: string;",
+      "  [propName: string]: any;",
+      "  readonly [index: number]: string;",
+      "  (source: string, subString: string): boolean;",
+      "  (start: number): string;",
+      "  reset(): void;",
+      "  a(c: (this: void, e: E) => void): void;",
       "}",
     ]);
 
     check([
       "interface Square<T, U> extends Shape<T, U>, Visible<T, U> {",
-      "  sideLength: number",
+      "  sideLength: number;",
       "}",
     ]);
 
@@ -265,19 +265,31 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
       "}",
     ])
 
-    check(["export interface S {", "  i(s: string): boolean", "}"]);
+    check([
+      "export interface S {",
+      "  i(s: string): boolean;",
+      "}"
+    ]);
 
     check([
       "namespace Validation {",
       "  export interface S {",
-      "    i(j: string): boolean",
+      "    i(j: string): boolean;",
       "  }",
       "}",
     ]);
 
-    check(["export interface S {", "  i(j: string): boolean", "}"]);
+    check([
+      "export interface S {",
+      "  i(j: string): boolean;",
+      "}",
+    ]);
 
-    check(["declare namespace D3 {", "  export const f: number;", "}"]);
+    check([
+      "declare namespace D3 {",
+      "  export const f: number;",
+      "}",
+    ]);
 
     check(["declare function foo<K, V>(arg: T = getDefault()): R"]);
 
@@ -287,7 +299,13 @@ const nodeMajorVersion = parseInt(process.versions.node, 10);
       "}",
     ]);
 
-    check(["function myFunction(", "  {", "    param1", "  }: Params", ") {}"]);
+    check([
+      "function myFunction(",
+      "  {",
+      "    param1",
+      "  }: Params",
+      ") {}",
+    ]);
 
     check([
       'const unqualified: import("package") = 1;',