Merge code from TSCO CLI (#111)

Author: aljazsim

README.md

@@ -180,7 +180,6 @@ See [TypeScript Code Organizer Command Line Interface](https://www.npmjs.com/pac
 
 - **configuration is no longer compatible with 1.x.x as version 2.x.x uses a configuration file**
 - merged functionality with [TypeScript Class Organizer CLI](https://www.npmjs.com/package/tsco-cli)
-
   - added support for configuration files
   - added support for organizing import statements
   - added ability to include/exclude files
@@ -189,11 +188,8 @@ See [TypeScript Code Organizer Command Line Interface](https://www.npmjs.com/pac
   - added more fine-grained configuration for module organization
   - added more fine-grained configuration for interface organization
   - added more fine-grained configuration for type alias organization
-
 - added ability to create a default configuration file
-
 - added support for regular expressions and globs when putting members above or below the member type group
-
 - added support for sorting member type groups asc, desc or no sorting
 
 ### 2.0.7
@@ -219,8 +215,13 @@ See [TypeScript Code Organizer Command Line Interface](https://www.npmjs.com/pac
 - add support for exported enums, exported interfaces, exported classes and exported types (courtesy of [Carlos Jesús Huchim Ahumada](https://github.com/huchim))
 - add improved import statement grouping
 
-## 2.0.12
+### 2.0.12
+
 - add missing file namespace import grouping
 - add checking relative import source casing
 - add support for declaration dependency order resolution
 - fix issue with file name casing
+
+### 2.0.13
+
+- fix issue with access modifiers not being correctly updated

package.json

@@ -2,7 +2,7 @@
     "name": "tsco",
     "displayName": "TypeScript Code Organizer",
     "description": "TypeScript Code Organizer for VS Code",
-    "version": "2.0.12",
+    "version": "2.0.13",
     "publisher": "aljazsim",
     "author": {
         "name": "aljazsim",

src/tsco-cli/helpers/string-helper.ts

@@ -2,7 +2,7 @@ import wcmatch from "wildcard-match";
 
 import { space } from "../source-code/source-code-constants";
 
-// #region Exported Functions (3)
+// #region Exported Functions (4)
 
 export function convertPascalCaseToTitleCase(value: string)
 {
@@ -16,6 +16,11 @@ export function convertPascalCaseToTitleCase(value: string)
     return value;
 }
 
+export function escapeRegex(regex: string)
+{
+    return regex.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+
 export function matchRegEx(regex: string, text: string)
 {
     if (regex && regex.length > 0)

src/tsco-cli/source-code/source-code-constants.ts

@@ -15,3 +15,4 @@ export const endRegion = "#endregion";
 export const anythingRegex = ".+";
 export const spacesRegex = "\\s*";
 export const newLineRegex = `${newLine}|${cr}|${lf}`;
+

src/tsco-cli/source-code/source-code.ts

@@ -6,6 +6,7 @@ import { PropertyNode } from "../elements/property-node";
 import { SetterNode } from "../elements/setter-node";
 import { AccessModifier } from "../enums/access-modifier";
 import { WriteModifier } from "../enums/write-modifier";
+import { escapeRegex } from "../helpers/string-helper";
 import { anythingRegex, endRegion, newLine, newLineRegex, space, spacesRegex, startRegion } from "./source-code-constants";
 
 export class SourceCode
@@ -81,7 +82,7 @@ export class SourceCode
         const getAbstract = (isAbstract: boolean) => isAbstract ? "abstract " : "";
         const getReadOnly = (writeMode: WriteModifier) => writeMode === WriteModifier.readOnly ? "readonly " : "";
         const getString = (strings: string[]) => ["private"].concat(strings).filter(s => s !== "").map(s => s.trim()).join(space);
-        const getRegex = (strings: string[]) => new RegExp(strings.filter(s => s !== "").map(s => s.trim()).join(spacesRegex));
+        const getRegex = (strings: string[]) => new RegExp(strings.filter(s => s !== "").map(s => escapeRegex(s.trim())).join(spacesRegex));
         const removeHash = (name: string) => name.substring(1);
 
         if (node.name.startsWith("#") && node.accessModifier === AccessModifier.private)
@@ -122,7 +123,10 @@ export class SourceCode
                 const codeAfterDecorators = node.sourceCode.substring(codeDecoratorsEndIndex);
                 const newNodeSourceCode = codeDecorators + codeAfterDecorators.replace(regex, replaceWith);
 
-                this.sourceCode = this.sourceCode.replace(node.sourceCode, newNodeSourceCode); // replace node declaration
+                const sourceCodeBefore = this.sourceCode.substring(0, this.sourceCode.indexOf(node.sourceCode));
+                const sourceCodeAfter = this.sourceCode.substring(this.sourceCode.indexOf(node.sourceCode) + node.sourceCode.length);
+
+                this.sourceCode = sourceCodeBefore + newNodeSourceCode + sourceCodeAfter; // replace node declaration
                 this.sourceCode.replaceAll(`this.${node.name}`, `this.${removeHash(node.name)}`); // replace all references
             }
         }
@@ -135,7 +139,7 @@ export class SourceCode
         const getAbstract = (isAbstract: boolean) => isAbstract ? "abstract " : "";
         const getReadOnly = (writeMode: WriteModifier) => writeMode === WriteModifier.readOnly ? "readonly " : "";
         const getString = (strings: string[]) => ["public"].concat(strings).filter(s => s !== "").map(s => s.trim()).join(space);
-        const getRegex = (strings: string[]) => new RegExp(strings.filter(s => s !== "").map(s => s.trim()).join(spacesRegex));
+        const getRegex = (strings: string[]) => new RegExp(strings.filter(s => s !== "").map(s => escapeRegex(s.trim())).join(spacesRegex));
 
         if (!node.name.startsWith("#") && node.accessModifier === null)
         {
@@ -175,7 +179,10 @@ export class SourceCode
                 const codeAfterDecorators = node.sourceCode.substring(codeDecoratorsEndIndex);
                 const newNodeSourceCode = codeDecorators + codeAfterDecorators.replace(regex, replaceWith);
 
-                this.sourceCode = this.sourceCode.replace(node.sourceCode, newNodeSourceCode);
+                const sourceCodeBefore = this.sourceCode.substring(0, this.sourceCode.indexOf(node.sourceCode));
+                const sourceCodeAfter = this.sourceCode.substring(this.sourceCode.indexOf(node.sourceCode) + node.sourceCode.length);
+
+                this.sourceCode = sourceCodeBefore + newNodeSourceCode + sourceCodeAfter;
             }
         }
     }