@runtime-type-inspector/transpiler 4.0.1 → 4.0.3

package/index.cjs

@@ -1555,7 +1555,7 @@
 	      out += this.toSource(node);
 	      if (needCurly) {
 	        out += '\n';
-	        out += spaces;
+	        out += spaces.slice(0, -2);
 	        out += '}';
 	      }
 	      return out;
@@ -1986,7 +1986,10 @@
 	        directives = node.directives;
 	      var spaces = this.spaces;
 	      var out = '';
-	      out += ' {';
+	      if (this.parentType !== 'Program') {
+	        out += ' ';
+	      }
+	      out += '{';
 	      this.numSpaces++;
 	      // Handle Directive/DirectiveLiteral like 'use strict';
 	      if (directives && directives.length) {
@@ -1995,8 +1998,7 @@
 	      }
 	      out += this.generateTypeChecks(node);
 	      if (body.length) {
-	        if (out.length === 2) {
-	          // 2 is ' {'
+	        if (out[out.length - 1] === '{') {
 	          out += '\n';
 	        }
 	        // out += '/*'+out.length+'*/';
@@ -2066,16 +2068,26 @@
 	      var alternate = node.alternate,
 	        consequent = node.consequent,
 	        test = node.test;
-	      var spaces = this.spaces;
 	      var out = '';
-	      //if (this.parentType !== "IfStatement")
-	      //{
-	      out += spaces;
-	      //}
+	      if (this.forceCurly) {
+	        out += this.spaces;
+	      } else {
+	        if (this.parentType === 'BlockStatement') {
+	          out += this.spaces;
+	        } else if (this.parentType === 'IfStatement') {
+	          out += ' ';
+	        }
+	      }
 	      out += "if (".concat(this.toSource(test), ")");
 	      out += this.toSourceCurly(consequent);
 	      if (alternate) {
+	        if (this.forceCurly) {
+	          this.numSpaces++;
+	        }
 	        out += " else".concat(this.toSourceCurly(alternate));
+	        if (this.forceCurly) {
+	          this.numSpaces--;
+	        }
 	      }
 	      return out;
 	    }

package/index.mjs

@@ -1296,7 +1296,7 @@ class Stringifier {
     out += this.toSource(node);
     if (needCurly) {
       out += '\n';
-      out += spaces;
+      out += spaces.slice(0, -2);
       out += '}';
     }
     return out;
@@ -1702,7 +1702,10 @@ class Stringifier {
     } = node;
     const spaces = this.spaces;
     let out = '';
-    out += ' {';
+    if (this.parentType !== 'Program') {
+      out += ' ';
+    }
+    out += '{';
     this.numSpaces++;
     // Handle Directive/DirectiveLiteral like 'use strict';
     if (directives && directives.length) {
@@ -1711,8 +1714,7 @@ class Stringifier {
     }
     out += this.generateTypeChecks(node);
     if (body.length) {
-      if (out.length === 2) {
-        // 2 is ' {'
+      if (out[out.length - 1] === '{') {
         out += '\n';
       }
       // out += '/*'+out.length+'*/';
@@ -1784,16 +1786,26 @@ class Stringifier {
       consequent,
       test
     } = node;
-    const spaces = this.spaces;
     let out = '';
-    //if (this.parentType !== "IfStatement")
-    //{
-    out += spaces;
-    //}
+    if (this.forceCurly) {
+      out += this.spaces;
+    } else {
+      if (this.parentType === 'BlockStatement') {
+        out += this.spaces;
+      } else if (this.parentType === 'IfStatement') {
+        out += ' ';
+      }
+    }
     out += `if (${this.toSource(test)})`;
     out += this.toSourceCurly(consequent);
     if (alternate) {
+      if (this.forceCurly) {
+        this.numSpaces++;
+      }
       out += ` else${this.toSourceCurly(alternate)}`;
+      if (this.forceCurly) {
+        this.numSpaces--;
+      }
     }
     return out;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "bin": "bin.js",
   "name": "@runtime-type-inspector/transpiler",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "Validating JSDoc types at runtime for high-quality types - Trust is good, control is better.",
   "main": "index.cjs",
   "module": "index.mjs",
@@ -19,7 +19,7 @@
   "homepage": "https://github.com/kungfooman/RuntimeTypeInspector.js#readme",
   "dependencies": {
     "@babel/parser": "^7.23.0",
-    "@runtime-type-inspector/runtime": "^4.0.1",
+    "@runtime-type-inspector/runtime": "^4.0.3",
     "typescript": "^5.1.6"
   },
   "files": [