Transfer code from cli type organizer

aljazsim · web-flow · commit 36b4fef82c71 · 2025-02-23T20:17:46.000+10:00
diff --git a/README.md b/README.md
@@ -206,3 +206,8 @@ See [TypeScript Code Organizer Command Line Interface](https://www.npmjs.com/pac
 - fix issue with import statements with  comments
 - fix issue with sorting members with dependencies
 - fix organizing imports with type aliases
+
+### 2.0.9
+
+- fix issue with removing empty lines in code expressions
+- fix issue with using typed imports
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "tsco",
     "displayName": "TypeScript Code Organizer",
     "description": "TypeScript Code Organizer for VS Code",
-    "version": "2.0.8",
+    "version": "2.0.9",
     "publisher": "aljazsim",
     "author": {
         "name": "aljazsim",
diff --git a/src/tsco-cli/configuration/configuration.ts b/src/tsco-cli/configuration/configuration.ts
@@ -53,6 +53,8 @@ export class Configuration
             if (configurationFilePath && await fileExists(configurationFilePath))
             {
                 configuration = JSON.parse(await readFile(configurationFilePath));
+
+                console.log(`tsco using configuration ${configurationFilePath}`);
             }
             else
             {
diff --git a/src/tsco-cli/elements/import-node.ts b/src/tsco-cli/elements/import-node.ts
@@ -5,15 +5,16 @@ import { ElementNode } from "./element-node";
 
 export class ImportNode extends ElementNode
 {
-    // #region Properties (6)
+    // #region Properties (7)
 
     public readonly name: string;
 
     public isModuleReference = false;
     public nameBinding: string | null = null;
-    public namedImports: { type: boolean, name: string, alias: string | null }[] | null = null;
+    public namedImports: { typeOnly: boolean, name: string, alias: string | null }[] | null = null;
     public namespace: string | null = null;
     public source: string;
+    public type = false;
 
     // #endregion Properties
 
@@ -29,7 +30,7 @@ export class ImportNode extends ElementNode
         this.source = this.getSource(importDeclaration);
 
         const isRelativeReference = this.source.startsWith(".") || this.source.startsWith("..");
-        const isAbsoluteReference = !isRelativeReference && (this.source.indexOf("/") > -1 || this.source.indexOf("\\") > -1);
+        const isAbsoluteReference = !isRelativeReference && !this.source.startsWith("@") && (this.source.indexOf("/") > -1 || this.source.indexOf("\\") > -1);
 
         this.isModuleReference = !isRelativeReference && !isAbsoluteReference;
     }
@@ -59,9 +60,9 @@ export class ImportNode extends ElementNode
                 }
                 else if (ts.isNamedImports(node.importClause?.namedBindings))
                 {
-                    this.namedImports = distinct(node.importClause?.namedBindings.elements.map(e => (
+                    this.namedImports = distinct(node.importClause!.namedBindings.elements.map(e => (
                         {
-                            type: e.isTypeOnly,
+                            typeOnly: node.importClause!.isTypeOnly || e.isTypeOnly,
                             name: e.name.text.trim(),
                             alias: e.propertyName?.text.trim() ?? null
                         })));
diff --git a/src/tsco-cli/source-code/source-code-analyzer.ts b/src/tsco-cli/source-code/source-code-analyzer.ts
@@ -118,7 +118,7 @@ export class SourceCodeAnalyzer
                 elements = elements.concat(this.traverseSyntaxTree(childNode, sourceFile, configuration));
             }
         }
-        else if (!ts.isEmptyStatement(node))
+        else if (!ts.isEmptyStatement(node) && node.kind != ts.SyntaxKind.EndOfFileToken)
         {
             // expression
             elements.push(new ExpressionNode(sourceFile, node));
diff --git a/src/tsco-cli/source-code/source-code-organizer.ts b/src/tsco-cli/source-code/source-code-organizer.ts
@@ -8,7 +8,7 @@ import { ElementNodeGroup } from "../elements/element-node-group";
 import { ImportNode } from "../elements/import-node";
 import { VariableNode } from "../elements/variable-node";
 import { ModuleMemberType } from "../enums/module-member-type";
-import { distinct, except, intersect, remove } from "../helpers/array-helper";
+import { except, intersect, remove } from "../helpers/array-helper";
 import { compareStrings } from "../helpers/comparing-helper";
 import { getFileExtension } from "../helpers/file-system-helper";
 import { getClasses, getEnums, getExpressions, getFunctions, getImports, getInterfaces, getTypeAliases, getVariables, order } from "../helpers/node-helper";
@@ -22,7 +22,7 @@ export class SourceCodeOrganizer
 
     public static async organizeSourceCode(sourceCodeFilePath: string, sourceCode: string, configuration: Configuration)
     {
-        const ignoreComment1Regex = new RegExp("//\\s*tsco:ignore");
+        const ignoreComment1Regex = new RegExp("//\\s*tsco\\s*:\\s*ignore");
         const ignoreComment2Regex = new RegExp("//\\s*<auto-generated\\s*/>");
 
         if (sourceCode &&
@@ -32,6 +32,7 @@ export class SourceCodeOrganizer
             try 
             {
                 const sourceCodeWithoutRegions = new SourceCode(sourceCode);
+
                 sourceCodeWithoutRegions.removeRegions(); // strip regions, they will get re-generated
 
                 const sourceFile = ts.createSourceFile(sourceCodeFilePath, sourceCodeWithoutRegions.toString(), ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
@@ -95,7 +96,29 @@ export class SourceCodeOrganizer
                         (!firstImport.namespace && !secondImport.namespace))
                     {
                         firstImport.nameBinding = firstImport.nameBinding ?? secondImport.nameBinding;
-                        firstImport.namedImports = distinct((firstImport.namedImports ?? []).concat(secondImport.namedImports ?? []));
+                        firstImport.namedImports = firstImport.namedImports ?? [];
+
+                        for (const secondNamedImport of secondImport.namedImports ?? [])
+                        {
+                            const match = firstImport.namedImports.find(ni => ni.name === secondNamedImport.name);
+
+                            if (!match)
+                            {
+                                firstImport.namedImports.push(secondNamedImport);
+                            }
+                            else 
+                            {
+                                if (!match.typeOnly && secondNamedImport.typeOnly)
+                                {
+                                    match.typeOnly = true;
+                                }
+
+                                if (match.alias == null && !secondNamedImport.alias)
+                                {
+                                    match.alias = secondNamedImport.alias;
+                                }
+                            }
+                        }
 
                         remove(imports, secondImport);
                     }
@@ -281,7 +304,7 @@ export class SourceCodeOrganizer
     {
         for (const import1 of imports.filter(i => i.isEmptyReference))
         {
-            if (import1.isModuleReference || !getFileExtension(import1.source) || getFileExtension(import1.source) === ".ts" || getFileExtension(import1.source) === ".js")
+            if (import1.isModuleReference || !getFileExtension(import1.source) || getFileExtension(import1.source) === ".ts" || getFileExtension(import1.source) === "")
             {
                 remove(imports, import1);
             }
diff --git a/src/tsco-cli/source-code/source-code-printer.ts b/src/tsco-cli/source-code/source-code-printer.ts
@@ -4,6 +4,7 @@ import { AccessorNode } from "../elements/accessor-node";
 import { ClassNode } from "../elements/class-node";
 import { ElementNode } from "../elements/element-node";
 import { ElementNodeGroup } from "../elements/element-node-group";
+import { ExpressionNode } from "../elements/expression-node";
 import { FunctionNode } from "../elements/function-node";
 import { GetterNode } from "../elements/getter-node";
 import { GetterSignatureNode } from "../elements/getter-signature-node";
@@ -70,15 +71,15 @@ export class SourceCodePrinter
 
         if (beforeMembers.length > 0)
         {
-            nodeSourceCode.add(beforeMembers);
+            nodeSourceCode.addAfter(beforeMembers);
             nodeSourceCode.addNewLineAfter();
         }
 
-        nodeSourceCode.add(members);
+        nodeSourceCode.addAfter(members);
 
         if (afterMembers.length > 0)
         {
-            nodeSourceCode.add(afterMembers);
+            nodeSourceCode.addAfter(afterMembers);
         }
 
         return nodeSourceCode;
@@ -92,6 +93,17 @@ export class SourceCodePrinter
         const nameBinding = node.nameBinding;
         const namespace = node.namespace;
         let sourceCode = ""
+        let namedImportsSourceCode = "";
+
+        if (namedImports.length > 0)
+        {
+            const allTypeOnly = namedImports.every(ni => ni.typeOnly);
+
+            namedImportsSourceCode += allTypeOnly ? "type " : "";
+            namedImportsSourceCode += "{ ";
+            namedImportsSourceCode += namedImports.map(ni => (ni.typeOnly && !allTypeOnly ? "type " : "") + (ni.alias ? (ni.alias + " as ") : "") + ni.name).join(", ");
+            namedImportsSourceCode += " }";
+        }
 
         if (nameBinding)
         {
@@ -101,7 +113,7 @@ export class SourceCodePrinter
             }
             else if (namedImports.length > 0)
             {
-                sourceCode = `import ${nameBinding}, { ${namedImports.map(ni => (ni.type ? "type " : "") + (ni.alias ? (ni.alias + " as ") : "") + ni.name).join(", ")} } from ${quote}${source}${quote};`;
+                sourceCode = `import ${nameBinding}, ${namedImportsSourceCode} from ${quote}${source}${quote};`;
             }
             else
             {
@@ -114,7 +126,7 @@ export class SourceCodePrinter
         }
         else if (namedImports.length > 0)
         {
-            sourceCode = `import { ${namedImports.map(ni => (ni.type ? "type " : "") + (ni.alias ? (ni.alias + " as ") : "") + ni.name).join(", ")} } from ${quote}${source}${quote};`;
+            sourceCode = `import ${namedImportsSourceCode} from ${quote}${source}${quote};`;
         }
         else
         {
@@ -138,15 +150,15 @@ export class SourceCodePrinter
 
         if (beforeMembers.length > 0)
         {
-            nodeSourceCode.add(beforeMembers);
+            nodeSourceCode.addAfter(beforeMembers);
             nodeSourceCode.addNewLineAfter();
         }
 
-        nodeSourceCode.add(members);
+        nodeSourceCode.addAfter(members);
 
         if (afterMembers.length > 0)
         {
-            nodeSourceCode.add(afterMembers);
+            nodeSourceCode.addAfter(afterMembers);
         }
 
         return nodeSourceCode;
@@ -198,7 +210,7 @@ export class SourceCodePrinter
         const nodeGroupNodeCount = nodeGroup.getNodeCount();
 
         // print subgroups
-        nodeGroupSourceCode.add(this.printNodeGroups(nodeGroup.nodeSubGroups, configuration));
+        nodeGroupSourceCode.addAfter(this.printNodeGroups(nodeGroup.nodeSubGroups, configuration));
 
         // print nodes within a group
         for (const node of nodeGroup.nodes)
@@ -229,7 +241,8 @@ export class SourceCodePrinter
                 node instanceof FunctionNode ||
                 node instanceof MethodNode ||
                 (node instanceof PropertyNode && node.writeMode !== WriteModifier.readOnly && node.isArrowFunction && configuration.classes.members.treatArrowFunctionPropertiesAsMethods) ||
-                (node instanceof PropertyNode && node.writeMode === WriteModifier.readOnly && node.isArrowFunction && configuration.classes.members.treatArrowFunctionReadOnlyPropertiesAsMethods))
+                (node instanceof PropertyNode && node.writeMode === WriteModifier.readOnly && node.isArrowFunction && configuration.classes.members.treatArrowFunctionReadOnlyPropertiesAsMethods) ||
+                node instanceof ExpressionNode)
             {
                 if (nodeGroup.nodes.indexOf(node) > 0)
                 {
@@ -249,7 +262,7 @@ export class SourceCodePrinter
                 }
             }
 
-            nodeGroupSourceCode.add(nodeSourceCode);
+            nodeGroupSourceCode.addAfter(nodeSourceCode);
         }
 
         if (nodeGroup.isRegion && nodeGroup.regionConfiguration?.addRegions)
@@ -277,7 +290,7 @@ export class SourceCodePrinter
                 sourceCode.addNewLineBefore();
             }
 
-            nodeGroupsSourceCode.add(sourceCode);
+            nodeGroupsSourceCode.addAfter(sourceCode);
         }
 
         return nodeGroupsSourceCode;
@@ -308,15 +321,15 @@ export class SourceCodePrinter
 
         if (beforeMembers.length > 0)
         {
-            nodeSourceCode.add(beforeMembers);
+            nodeSourceCode.addAfter(beforeMembers);
             nodeSourceCode.addNewLineAfter();
         }
 
-        nodeSourceCode.add(members);
+        nodeSourceCode.addAfter(members);
 
         if (afterMembers.length > 0)
         {
-            nodeSourceCode.add(afterMembers);
+            nodeSourceCode.addAfter(afterMembers);
         }
 
         return nodeSourceCode;
diff --git a/src/tsco-cli/source-code/source-code.ts b/src/tsco-cli/source-code/source-code.ts
@@ -23,23 +23,27 @@ export class SourceCode
 
     // #endregion Constructors
 
-    // #region Public Methods (12)
+    // #region Public Methods (13)
 
-    public add(newSourceCode: string | SourceCode, where: "before" | "after" = "after")
+    public addAfter(newSourceCode: string | SourceCode)
     {
-        if (newSourceCode instanceof SourceCode && where === "after")
+        if (newSourceCode instanceof SourceCode)
         {
             this.sourceCode = this.sourceCode + newSourceCode.toString();
         }
-        else if (newSourceCode instanceof SourceCode && where === "before")
+        else
         {
-            this.sourceCode = newSourceCode.toString() + this.sourceCode;
+            this.sourceCode = this.sourceCode + newSourceCode;
         }
-        else if (where === "after")
+    }
+
+    public addBefore(newSourceCode: string | SourceCode)
+    {
+        if (newSourceCode instanceof SourceCode)
         {
-            this.sourceCode = this.sourceCode + newSourceCode;
+            this.sourceCode = newSourceCode.toString() + this.sourceCode;
         }
-        else if (where === "before")
+        else
         {
             this.sourceCode = newSourceCode + this.sourceCode;
         }
@@ -53,13 +57,13 @@ export class SourceCode
 
             this.sourceCode = comment.trimEnd();
             this.addNewLineAfter();
-            this.add(temp);
+            this.addAfter(temp);
         }
     }
 
     public addNewLineAfter()
     {
-        this.add(this.newLine);
+        this.addAfter(this.newLine);
     }
 
     public addNewLineAfterIf(condition: boolean)
@@ -72,7 +76,7 @@ export class SourceCode
 
     public addNewLineBefore()
     {
-        this.add(this.newLine, "before");
+        this.addBefore(this.newLine);
     }
 
     public addPrivateModifierIfStartingWithHash(node: PropertyNode | MethodNode | AccessorNode | GetterNode | SetterNode)
@@ -204,9 +208,9 @@ export class SourceCode
         this.sourceCode = region;
         this.addNewLineAfter();
         this.addNewLineAfter();
-        this.add(code);
+        this.addAfter(code);
         this.addNewLineAfter();
-        this.add(endregion);
+        this.addAfter(endregion);
         this.addNewLineAfter();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ export class Configuration`
`53`	`53`	`if (configurationFilePath && await fileExists(configurationFilePath))`
`54`	`54`	`{`
`55`	`55`	`configuration = JSON.parse(await readFile(configurationFilePath));`
	`56`	`+`
	`57`	+ console.log(`tsco using configuration ${configurationFilePath}`);
`56`	`58`	`}`
`57`	`59`	`else`
`58`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ export class SourceCodeAnalyzer`
`118`	`118`	`elements = elements.concat(this.traverseSyntaxTree(childNode, sourceFile, configuration));`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`- else if (!ts.isEmptyStatement(node))`
	`121`	`+ else if (!ts.isEmptyStatement(node) && node.kind != ts.SyntaxKind.EndOfFileToken)`
`122`	`122`	`{`
`123`	`123`	`// expression`
`124`	`124`	`elements.push(new ExpressionNode(sourceFile, node));`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { AccessorNode } from "../elements/accessor-node";`
`4`	`4`	`import { ClassNode } from "../elements/class-node";`
`5`	`5`	`import { ElementNode } from "../elements/element-node";`
`6`	`6`	`import { ElementNodeGroup } from "../elements/element-node-group";`
	`7`	`+import { ExpressionNode } from "../elements/expression-node";`
`7`	`8`	`import { FunctionNode } from "../elements/function-node";`
`8`	`9`	`import { GetterNode } from "../elements/getter-node";`
`9`	`10`	`import { GetterSignatureNode } from "../elements/getter-signature-node";`
`@@ -70,15 +71,15 @@ export class SourceCodePrinter`
`70`	`71`
`71`	`72`	`if (beforeMembers.length > 0)`
`72`	`73`	`{`
`73`		`- nodeSourceCode.add(beforeMembers);`
	`74`	`+ nodeSourceCode.addAfter(beforeMembers);`
`74`	`75`	`nodeSourceCode.addNewLineAfter();`
`75`	`76`	`}`
`76`	`77`
`77`		`- nodeSourceCode.add(members);`
	`78`	`+ nodeSourceCode.addAfter(members);`
`78`	`79`
`79`	`80`	`if (afterMembers.length > 0)`
`80`	`81`	`{`
`81`		`- nodeSourceCode.add(afterMembers);`
	`82`	`+ nodeSourceCode.addAfter(afterMembers);`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`return nodeSourceCode;`
`@@ -92,6 +93,17 @@ export class SourceCodePrinter`
`92`	`93`	`const nameBinding = node.nameBinding;`
`93`	`94`	`const namespace = node.namespace;`
`94`	`95`	`let sourceCode = ""`
	`96`	`+ let namedImportsSourceCode = "";`
	`97`	`+`
	`98`	`+ if (namedImports.length > 0)`
	`99`	`+ {`
	`100`	`+ const allTypeOnly = namedImports.every(ni => ni.typeOnly);`
	`101`	`+`
	`102`	`+ namedImportsSourceCode += allTypeOnly ? "type " : "";`
	`103`	`+ namedImportsSourceCode += "{ ";`
	`104`	`+ namedImportsSourceCode += namedImports.map(ni => (ni.typeOnly && !allTypeOnly ? "type " : "") + (ni.alias ? (ni.alias + " as ") : "") + ni.name).join(", ");`
	`105`	`+ namedImportsSourceCode += " }";`
	`106`	`+ }`
`95`	`107`
`96`	`108`	`if (nameBinding)`
`97`	`109`	`{`
`@@ -101,7 +113,7 @@ export class SourceCodePrinter`
`101`	`113`	`}`
`102`	`114`	`else if (namedImports.length > 0)`
`103`	`115`	`{`
`104`		- sourceCode = `import ${nameBinding}, { ${namedImports.map(ni => (ni.type ? "type " : "") + (ni.alias ? (ni.alias + " as ") : "") + ni.name).join(", ")} } from ${quote}${source}${quote};`;
	`116`	+ sourceCode = `import ${nameBinding}, ${namedImportsSourceCode} from ${quote}${source}${quote};`;
`105`	`117`	`}`
`106`	`118`	`else`
`107`	`119`	`{`
`@@ -114,7 +126,7 @@ export class SourceCodePrinter`
`114`	`126`	`}`
`115`	`127`	`else if (namedImports.length > 0)`
`116`	`128`	`{`
`117`		- sourceCode = `import { ${namedImports.map(ni => (ni.type ? "type " : "") + (ni.alias ? (ni.alias + " as ") : "") + ni.name).join(", ")} } from ${quote}${source}${quote};`;
	`129`	+ sourceCode = `import ${namedImportsSourceCode} from ${quote}${source}${quote};`;
`118`	`130`	`}`
`119`	`131`	`else`
`120`	`132`	`{`
`@@ -138,15 +150,15 @@ export class SourceCodePrinter`
`138`	`150`
`139`	`151`	`if (beforeMembers.length > 0)`
`140`	`152`	`{`
`141`		`- nodeSourceCode.add(beforeMembers);`
	`153`	`+ nodeSourceCode.addAfter(beforeMembers);`
`142`	`154`	`nodeSourceCode.addNewLineAfter();`
`143`	`155`	`}`
`144`	`156`
`145`		`- nodeSourceCode.add(members);`
	`157`	`+ nodeSourceCode.addAfter(members);`
`146`	`158`
`147`	`159`	`if (afterMembers.length > 0)`
`148`	`160`	`{`
`149`		`- nodeSourceCode.add(afterMembers);`
	`161`	`+ nodeSourceCode.addAfter(afterMembers);`
`150`	`162`	`}`
`151`	`163`
`152`	`164`	`return nodeSourceCode;`
`@@ -198,7 +210,7 @@ export class SourceCodePrinter`
`198`	`210`	`const nodeGroupNodeCount = nodeGroup.getNodeCount();`
`199`	`211`
`200`	`212`	`// print subgroups`
`201`		`- nodeGroupSourceCode.add(this.printNodeGroups(nodeGroup.nodeSubGroups, configuration));`
	`213`	`+ nodeGroupSourceCode.addAfter(this.printNodeGroups(nodeGroup.nodeSubGroups, configuration));`
`202`	`214`
`203`	`215`	`// print nodes within a group`
`204`	`216`	`for (const node of nodeGroup.nodes)`
`@@ -229,7 +241,8 @@ export class SourceCodePrinter`
`229`	`241`	`node instanceof FunctionNode \|\|`
`230`	`242`	`node instanceof MethodNode \|\|`
`231`	`243`	`(node instanceof PropertyNode && node.writeMode !== WriteModifier.readOnly && node.isArrowFunction && configuration.classes.members.treatArrowFunctionPropertiesAsMethods) \|\|`
`232`		`- (node instanceof PropertyNode && node.writeMode === WriteModifier.readOnly && node.isArrowFunction && configuration.classes.members.treatArrowFunctionReadOnlyPropertiesAsMethods))`
	`244`	`+ (node instanceof PropertyNode && node.writeMode === WriteModifier.readOnly && node.isArrowFunction && configuration.classes.members.treatArrowFunctionReadOnlyPropertiesAsMethods) \|\|`
	`245`	`+ node instanceof ExpressionNode)`
`233`	`246`	`{`
`234`	`247`	`if (nodeGroup.nodes.indexOf(node) > 0)`
`235`	`248`	`{`
`@@ -249,7 +262,7 @@ export class SourceCodePrinter`
`249`	`262`	`}`
`250`	`263`	`}`
`251`	`264`
`252`		`- nodeGroupSourceCode.add(nodeSourceCode);`
	`265`	`+ nodeGroupSourceCode.addAfter(nodeSourceCode);`
`253`	`266`	`}`
`254`	`267`
`255`	`268`	`if (nodeGroup.isRegion && nodeGroup.regionConfiguration?.addRegions)`
`@@ -277,7 +290,7 @@ export class SourceCodePrinter`
`277`	`290`	`sourceCode.addNewLineBefore();`
`278`	`291`	`}`
`279`	`292`
`280`		`- nodeGroupsSourceCode.add(sourceCode);`
	`293`	`+ nodeGroupsSourceCode.addAfter(sourceCode);`
`281`	`294`	`}`
`282`	`295`
`283`	`296`	`return nodeGroupsSourceCode;`
`@@ -308,15 +321,15 @@ export class SourceCodePrinter`
`308`	`321`
`309`	`322`	`if (beforeMembers.length > 0)`
`310`	`323`	`{`
`311`		`- nodeSourceCode.add(beforeMembers);`
	`324`	`+ nodeSourceCode.addAfter(beforeMembers);`
`312`	`325`	`nodeSourceCode.addNewLineAfter();`
`313`	`326`	`}`
`314`	`327`
`315`		`- nodeSourceCode.add(members);`
	`328`	`+ nodeSourceCode.addAfter(members);`
`316`	`329`
`317`	`330`	`if (afterMembers.length > 0)`
`318`	`331`	`{`
`319`		`- nodeSourceCode.add(afterMembers);`
	`332`	`+ nodeSourceCode.addAfter(afterMembers);`
`320`	`333`	`}`
`321`	`334`
`322`	`335`	`return nodeSourceCode;`
Original file line number	Diff line number	Diff line change
`@@ -23,23 +23,27 @@ export class SourceCode`
`23`	`23`
`24`	`24`	`// #endregion Constructors`
`25`	`25`
`26`		`- // #region Public Methods (12)`
	`26`	`+ // #region Public Methods (13)`
`27`	`27`
`28`		`- public add(newSourceCode: string \| SourceCode, where: "before" \| "after" = "after")`
	`28`	`+ public addAfter(newSourceCode: string \| SourceCode)`
`29`	`29`	`{`
`30`		`- if (newSourceCode instanceof SourceCode && where === "after")`
	`30`	`+ if (newSourceCode instanceof SourceCode)`
`31`	`31`	`{`
`32`	`32`	`this.sourceCode = this.sourceCode + newSourceCode.toString();`
`33`	`33`	`}`
`34`		`- else if (newSourceCode instanceof SourceCode && where === "before")`
	`34`	`+ else`
`35`	`35`	`{`
`36`		`- this.sourceCode = newSourceCode.toString() + this.sourceCode;`
	`36`	`+ this.sourceCode = this.sourceCode + newSourceCode;`
`37`	`37`	`}`
`38`		`- else if (where === "after")`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ public addBefore(newSourceCode: string \| SourceCode)`
	`41`	`+ {`
	`42`	`+ if (newSourceCode instanceof SourceCode)`
`39`	`43`	`{`
`40`		`- this.sourceCode = this.sourceCode + newSourceCode;`
	`44`	`+ this.sourceCode = newSourceCode.toString() + this.sourceCode;`
`41`	`45`	`}`
`42`		`- else if (where === "before")`
	`46`	`+ else`
`43`	`47`	`{`
`44`	`48`	`this.sourceCode = newSourceCode + this.sourceCode;`
`45`	`49`	`}`
`@@ -53,13 +57,13 @@ export class SourceCode`
`53`	`57`
`54`	`58`	`this.sourceCode = comment.trimEnd();`
`55`	`59`	`this.addNewLineAfter();`
`56`		`- this.add(temp);`
	`60`	`+ this.addAfter(temp);`
`57`	`61`	`}`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`public addNewLineAfter()`
`61`	`65`	`{`
`62`		`- this.add(this.newLine);`
	`66`	`+ this.addAfter(this.newLine);`
`63`	`67`	`}`
`64`	`68`
`65`	`69`	`public addNewLineAfterIf(condition: boolean)`
`@@ -72,7 +76,7 @@ export class SourceCode`
`72`	`76`
`73`	`77`	`public addNewLineBefore()`
`74`	`78`	`{`
`75`		`- this.add(this.newLine, "before");`
	`79`	`+ this.addBefore(this.newLine);`
`76`	`80`	`}`
`77`	`81`
`78`	`82`	`public addPrivateModifierIfStartingWithHash(node: PropertyNode \| MethodNode \| AccessorNode \| GetterNode \| SetterNode)`
`@@ -204,9 +208,9 @@ export class SourceCode`
`204`	`208`	`this.sourceCode = region;`
`205`	`209`	`this.addNewLineAfter();`
`206`	`210`	`this.addNewLineAfter();`
`207`		`- this.add(code);`
	`211`	`+ this.addAfter(code);`
`208`	`212`	`this.addNewLineAfter();`
`209`		`- this.add(endregion);`
	`213`	`+ this.addAfter(endregion);`
`210`	`214`	`this.addNewLineAfter();`
`211`	`215`	`}`
`212`	`216`