Merge from TSCO CLI

aljazsim · web-flow · commit 1570d1e62811 · 2025-03-09T19:04:15.000+10:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,5 +12,25 @@
         ".git_ignore": true,
         "out": true
     },
-    "cSpell.enabled": false
-}
+    "cSpell.enabled": false,
+    "workbench.colorCustomizations": {
+        "activityBar.activeBackground": "#fa1b49",
+        "activityBar.background": "#fa1b49",
+        "activityBar.foreground": "#e7e7e7",
+        "activityBar.inactiveForeground": "#e7e7e799",
+        "activityBarBadge.background": "#155e02",
+        "activityBarBadge.foreground": "#e7e7e7",
+        "commandCenter.border": "#e7e7e799",
+        "sash.hoverBorder": "#fa1b49",
+        "statusBar.background": "#dd0531",
+        "statusBar.foreground": "#e7e7e7",
+        "statusBarItem.hoverBackground": "#fa1b49",
+        "statusBarItem.remoteBackground": "#dd0531",
+        "statusBarItem.remoteForeground": "#e7e7e7",
+        "titleBar.activeBackground": "#dd0531",
+        "titleBar.activeForeground": "#e7e7e7",
+        "titleBar.inactiveBackground": "#dd053199",
+        "titleBar.inactiveForeground": "#e7e7e799"
+    },
+    "peacock.color": "#dd0531"
+}
diff --git a/README.md b/README.md
@@ -218,3 +218,9 @@ See [TypeScript Code Organizer Command Line Interface](https://www.npmjs.com/pac
 - fix issue with declaring modules
 - 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
+- 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
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.10",
+    "version": "2.0.12",
     "publisher": "aljazsim",
     "author": {
         "name": "aljazsim",
diff --git a/src/extension.ts b/src/extension.ts
@@ -1,9 +1,11 @@
-import globToRegExp from "glob-to-regexp";
 import * as vscode from "vscode";
 
+import globToRegExp from "glob-to-regexp";
+
 import { Settings } from "./settings/settings";
 import { Configuration } from "./tsco-cli/configuration/configuration";
 import { fileExists, getDirectoryPath, getFullPath, getRelativePath, joinPath, readFile, writeFile } from "./tsco-cli/helpers/file-system-helper";
+import { log, setLogger } from "./tsco-cli/source-code/source-code-logger";
 import { SourceCodeOrganizer } from "./tsco-cli/source-code/source-code-organizer";
 
 // #region Functions (10)
@@ -14,21 +16,17 @@ async function getConfiguration(configurationFilePath: string | null)
     {
         if (await fileExists(configurationFilePath))
         {
-            output.appendLine(`tsco using configuration file ${configurationFilePath}`);
-
             // absolute configuration file path from settings
             return await Configuration.getConfiguration(configurationFilePath);
         }
         else if (await fileExists(joinPath(getWorkspaceRootDirectoryPath(), configurationFilePath)))
         {
-            output.appendLine(`tsco using configuration file ${joinPath(getWorkspaceRootDirectoryPath(), configurationFilePath)}`);
-
             // relative configuration file path from settings
             return await Configuration.getConfiguration(joinPath(getWorkspaceRootDirectoryPath(), configurationFilePath));
         }
         else
         {
-            output.appendLine(`tsco configuration file ${getFullPath(configurationFilePath)} not found`);
+            log(`tsco configuration file ${getFullPath(configurationFilePath)} not found`);
         }
     }
 
@@ -38,8 +36,6 @@ async function getConfiguration(configurationFilePath: string | null)
 
     if (await fileExists(configurationFilePath))
     {
-        output.appendLine(`tsco using configuration file ${configurationFilePath}`);
-
         // look in workspace root
         return await Configuration.getConfiguration(configurationFilePath);
     }
@@ -52,13 +48,11 @@ async function getConfiguration(configurationFilePath: string | null)
 
         if (await fileExists(configurationFilePath))
         {
-            output.appendLine(`tsco using configuration file ${configurationFilePath}`);
-
             return await Configuration.getConfiguration(configurationFilePath);
         }
     }
 
-    output.appendLine("tsco using default configuration");
+    log("tsco using default configuration");
 
     // default configuration
     return Configuration.getDefaultConfiguration();
@@ -196,12 +190,12 @@ async function organize(sourceCodeFilePath: string, configuration: Configuration
 
     if (configuration.files.include.length > 0)
     {
-        include = configuration.files.include.some(inc => matches(inc, sourceCodeFilePathRelative) || matches(inc, "./" + sourceCodeFilePathRelative));
+        include = configuration.files.include.some(inc => matches(inc, sourceCodeFilePathRelative) || matches(inc, sourceCodeFilePathRelative.replace("../", "").replace("./", "")));
     }
 
     if (configuration.files.exclude.length > 0)
     {
-        exclude = configuration.files.exclude.some(exc => matches(exc, sourceCodeFilePathRelative) || matches(exc, "./" + sourceCodeFilePathRelative));
+        exclude = configuration.files.exclude.some(exc => matches(exc, sourceCodeFilePathRelative) || matches(exc, sourceCodeFilePathRelative.replace("../", "").replace("./", "")));
     }
 
     if (include && !exclude)
@@ -223,22 +217,22 @@ async function organize(sourceCodeFilePath: string, configuration: Configuration
 
             await vscode.workspace.applyEdit(edit);
 
-            output.appendLine(`tsco organized ${sourceCodeFilePath}`);
+            log(`tsco organized ${sourceCodeFilePath}`);
 
             return true;
         }
         else
         {
-            output.appendLine(`tsco skipping organizing ${sourceCodeFilePath}, because it is already organized`);
+            log(`tsco skipping organizing ${sourceCodeFilePath}, because it is already organized`);
         }
     }
     else if (!include)
     {
-        output.appendLine(`tsco skipping organizing ${sourceCodeFilePath}, because it does not match file include patterns`);
+        log(`tsco skipping organizing ${sourceCodeFilePath}, because it does not match file include patterns`);
     }
     else if (exclude)
     {
-        output.appendLine(`tsco skipping organizing ${sourceCodeFilePath}, because it matches file exclude patterns`);
+        log(`tsco skipping organizing ${sourceCodeFilePath}, because it matches file exclude patterns`);
     }
 
     return false;
@@ -256,6 +250,11 @@ export function activate(context: vscode.ExtensionContext)
 
     vscode.workspace.onDidChangeConfiguration(() => settings = Settings.getSettings());
     savingHandler = vscode.workspace.onWillSaveTextDocument(async (e) => await onSave(e.document.uri.fsPath));
+
+    setLogger({
+        log: (message: string) => output.appendLine(message),
+        logError: (error: string | Error | unknown) => output.appendLine(`ERROR: ${error instanceof Error ? error.message : error?.toString() ?? ""}`)
+    });
 }
 
 // #endregion Exported Functions
diff --git a/src/tsco-cli/configuration/configuration.ts b/src/tsco-cli/configuration/configuration.ts
@@ -7,6 +7,7 @@ import { TypeMemberType } from "../enums/type-member-type";
 import { distinct, remove } from "../helpers/array-helper";
 import { fileExists, readFile } from "../helpers/file-system-helper";
 import { convertPascalCaseToTitleCase } from "../helpers/string-helper";
+import { log } from "../source-code/source-code-logger";
 import { ClassConfiguration } from "./class-configuration";
 import { ClassMemberConfiguration } from "./class-member-configuration";
 import { ClassMemberGroupConfiguration } from "./class-member-group-configuration";
@@ -55,16 +56,16 @@ export class Configuration
             {
                 configuration = JSON.parse(await readFile(configurationFilePath));
 
-                console.log(`tsco using configuration ${configurationFilePath}`);
+                log(`tsco using configuration file ${configurationFilePath}`);
             }
             else
             {
-                console.log("tsco using default configuration");
+                log("tsco using default configuration");
             }
         }
         catch
         {
-            console.log("tsco using default configuration");
+            log("tsco using default configuration");
         }
 
         return new Configuration(
diff --git a/src/tsco-cli/elements/class-node.ts b/src/tsco-cli/elements/class-node.ts
@@ -16,12 +16,11 @@ import { StaticBlockDeclarationNode } from "./static-block-declaration-node";
 
 export class ClassNode extends ElementNode
 {
-    // #region Properties (15)
+    // #region Properties (14)
 
     public readonly accessors: AccessorNode[] = [];
     public readonly constructors: ConstructorNode[] = [];
     public readonly decorators: string[];
-    public readonly dependencies: string[] = [];
     public readonly getters: GetterNode[] = [];
     public readonly isAbstract: boolean;
     public readonly isExport: boolean;
diff --git a/src/tsco-cli/elements/element-node.ts b/src/tsco-cli/elements/element-node.ts
@@ -4,8 +4,9 @@ import { getLeadingComment, getTrailingComment } from "../helpers/node-helper";
 
 export abstract class ElementNode
 {
-    // #region Properties (4)
+    // #region Properties (5)
 
+    public readonly dependencies: string[] = [];
     public readonly leadingComment: string | null;
     public abstract readonly name: string;
     public readonly sourceCode: string;
diff --git a/src/tsco-cli/elements/property-node.ts b/src/tsco-cli/elements/property-node.ts
@@ -2,7 +2,7 @@ import * as ts from "typescript";
 
 import { AccessModifier } from "../enums/access-modifier";
 import { WriteModifier } from "../enums/write-modifier";
-import { getAccessModifier, getDecorators, getIsAbstract, getIsArrowFunction, getIsStatic, getWriteMode } from "../helpers/node-helper";
+import { getAccessModifier, getDecorators, getDependencies, getIsAbstract, getIsArrowFunction, getIsStatic, getWriteMode } from "../helpers/node-helper";
 import { ElementNode } from "./element-node";
 
 export class PropertyNode extends ElementNode
@@ -41,6 +41,14 @@ export class PropertyNode extends ElementNode
         this.writeMode = getWriteMode(propertyDeclaration);
 
         this.isArrowFunction = getIsArrowFunction(propertyDeclaration);
+
+        if (propertyDeclaration.initializer)
+        {
+            for (const dependency of getDependencies(sourceFile, propertyDeclaration.initializer, []))
+            {
+                this.dependencies.push(dependency);
+            }
+        }
     }
 
     // #endregion Constructors
diff --git a/src/tsco-cli/elements/variable-node.ts b/src/tsco-cli/elements/variable-node.ts
@@ -5,9 +5,8 @@ import { ElementNode } from "./element-node";
 
 export class VariableNode extends ElementNode
 {
-    // #region Properties (3)
+    // #region Properties (2)
 
-    public readonly dependencies: string[] = [];
     public readonly isArrowFunction: boolean = false;
     public readonly name: string;
 
@@ -19,15 +18,27 @@ export class VariableNode extends ElementNode
     {
         super(sourceFile, variableDeclaration, leadingComment, trailingComment);
 
-        this.name = (<ts.Identifier>variableDeclaration.name).escapedText?.toString() ?? sourceFile.getFullText().substring(variableDeclaration.name.pos, variableDeclaration.name.end).trim();
+        if (ts.isIdentifier(variableDeclaration.name) && variableDeclaration.name.escapedText)
+        {
+            this.name = variableDeclaration.name.escapedText!.toString();
+        }
+        else if (ts.isObjectBindingPattern(variableDeclaration.name))
+        {
+            this.name = variableDeclaration.name.elements.map(e => (<ts.Identifier>e.name).escapedText!.toString()).join(",");
+        }
+        else
+        {
+            this.name = sourceFile.getFullText().substring(variableDeclaration.name.pos, variableDeclaration.name.end).trim();
+        }
 
         this.isArrowFunction = getIsArrowFunction(variableDeclaration);
 
         if (variableDeclaration.initializer)
         {
-            // we'll use this when sorting variables to make sure a variable that 
-            // depends on another variable is declared after the dependant variable
-            this.dependencies = getDependencies(sourceFile, variableDeclaration.initializer, []);
+            for (const dependency of getDependencies(sourceFile, variableDeclaration.initializer, []))
+            {
+                this.dependencies.push(dependency);
+            }
         }
     }
 
diff --git a/src/tsco-cli/enums/import-source-file-path-quote-type.ts b/src/tsco-cli/enums/import-source-file-path-quote-type.ts
diff --git a/src/tsco-cli/helpers/file-system-helper.ts b/src/tsco-cli/helpers/file-system-helper.ts
@@ -10,7 +10,7 @@ function toUnixPath(filePath: string)
 
 // #endregion Functions
 
-// #region Exported Functions (12)
+// #region Exported Functions (15)
 
 export async function deleteFile(filePath: string)
 {
@@ -20,6 +20,11 @@ export async function deleteFile(filePath: string)
     }
 }
 
+export async function directoryExists(directoryPath: string)
+{
+    return await fileExists(directoryPath);
+}
+
 export async function fileExists(filePath: string)
 {
     try
@@ -41,7 +46,7 @@ export function getDirectoryPath(filePath: string)
 
 export function getFileExtension(filePath: string)
 {
-    return getFileName(filePath).replace(getFileNameWithoutExtension(filePath), "");
+    return path.parse(filePath).ext;
 }
 
 export function getFileName(filePath: string)
@@ -51,7 +56,17 @@ export function getFileName(filePath: string)
 
 export function getFileNameWithoutExtension(filePath: string)
 {
-    return (path.basename(filePath) as string).replace(/\.[^/.]+$/, "");
+    return getFileName(filePath).substring(0, getFileName(filePath).length - getFileExtension(filePath).length);
+}
+
+export function getFilePathWithoutExtension(filePath: string)
+{
+    return filePath.substring(0, filePath.length - getFileExtension(filePath).length);
+}
+
+export async function getFiles(directoryPath: string, recursive: boolean = false)
+{
+    return (await fs.promises.readdir(directoryPath, { recursive })).map(fp => getFullPath(joinPath(directoryPath, fp)));
 }
 
 export function getFullPath(fileOrDirectoryPath: string)
@@ -66,7 +81,16 @@ export function getProjectRootDirectoryPath(filePath: string)
 
 export function getRelativePath(sourcePath: string, targetPath: string)
 {
-    return toUnixPath(path.relative(getFullPath(sourcePath), targetPath) as string);
+    const relativePath = toUnixPath(path.relative(getFullPath(sourcePath), targetPath) as string);
+
+    if (!relativePath.startsWith("./") && !relativePath.startsWith("../"))
+    {
+        return `./${relativePath}`;
+    }
+    else
+    {
+        return relativePath;
+    }
 }
 
 export function joinPath(path1: string, path2: string)
diff --git a/src/tsco-cli/helpers/node-helper.ts b/src/tsco-cli/helpers/node-helper.ts
@@ -41,7 +41,7 @@ function sortBy<T extends ElementNode>(nodes: T[], sortDirection: string, groupW
 
 // #endregion Functions
 
-// #region Exported Functions (31)
+// #region Exported Functions (33)
 
 export function getAccessModifier(node: ts.PropertyDeclaration | ts.GetAccessorDeclaration | ts.SetAccessorDeclaration | ts.MethodDeclaration | ts.PropertySignature | ts.IndexSignatureDeclaration)
 {
@@ -233,8 +233,8 @@ export function getLeadingComment(node: ts.Node, sourceFile: ts.SourceFile)
     if (commentRanges && commentRanges.length > 0)
     {
         const start = commentRanges[0].pos;
-        const end = commentRanges[0].end;
-        const trailingNewLine = commentRanges[0].hasTrailingNewLine;
+        const end = commentRanges[commentRanges.length - 1].end;
+        const trailingNewLine = commentRanges[commentRanges.length - 1].hasTrailingNewLine;
 
         return sourceCode.substring(start, end).trimStart() + (trailingNewLine ? newLine : "");
     }
@@ -326,6 +326,17 @@ export function getName(node: ElementNode, groupWithDecorators: boolean): string
     return `${nodeDecorators.join(", ")} ${nodeName}`.trim();
 }
 
+export function getNodeDependencies(nodes: ElementNode[])
+{
+    return distinct(nodes.flatMap(n => n.dependencies)).sort();
+}
+
+export function getNodeNames(nodes: ElementNode[])
+{
+    // anonymous constants can have more than one comma separated name
+    return nodes.map(n => n.name).flatMap(name => name.split(","));
+}
+
 export function getTrailingComment(node: ts.Node, sourceFile: ts.SourceFile)
 {
     const sourceCode = node.getFullText(sourceFile);
@@ -334,8 +345,8 @@ export function getTrailingComment(node: ts.Node, sourceFile: ts.SourceFile)
     if (commentRanges && commentRanges.length > 0)
     {
         const start = commentRanges[0].pos;
-        const end = commentRanges[0].end;
-        const trailingNewLine = commentRanges[0].hasTrailingNewLine;
+        const end = commentRanges[commentRanges.length - 1].end;
+        const trailingNewLine = commentRanges[commentRanges.length - 1].hasTrailingNewLine;
 
         return sourceCode.substring(start, end).trimEnd() + (trailingNewLine ? newLine : "");
     }
diff --git a/src/tsco-cli/source-code/source-code-logger.ts b/src/tsco-cli/source-code/source-code-logger.ts
diff --git a/src/tsco-cli/source-code/source-code-organizer.ts b/src/tsco-cli/source-code/source-code-organizer.ts

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`		`-import globToRegExp from "glob-to-regexp";`
`2`	`1`	`import * as vscode from "vscode";`
`3`	`2`
	`3`	`+import globToRegExp from "glob-to-regexp";`
	`4`	`+`
`4`	`5`	`import { Settings } from "./settings/settings";`
`5`	`6`	`import { Configuration } from "./tsco-cli/configuration/configuration";`
`6`	`7`	`import { fileExists, getDirectoryPath, getFullPath, getRelativePath, joinPath, readFile, writeFile } from "./tsco-cli/helpers/file-system-helper";`
	`8`	`+import { log, setLogger } from "./tsco-cli/source-code/source-code-logger";`
`7`	`9`	`import { SourceCodeOrganizer } from "./tsco-cli/source-code/source-code-organizer";`
`8`	`10`
`9`	`11`	`// #region Functions (10)`
`@@ -14,21 +16,17 @@ async function getConfiguration(configurationFilePath: string \| null)`
`14`	`16`	`{`
`15`	`17`	`if (await fileExists(configurationFilePath))`
`16`	`18`	`{`
`17`		- output.appendLine(`tsco using configuration file ${configurationFilePath}`);
`18`		`-`
`19`	`19`	`// absolute configuration file path from settings`
`20`	`20`	`return await Configuration.getConfiguration(configurationFilePath);`
`21`	`21`	`}`
`22`	`22`	`else if (await fileExists(joinPath(getWorkspaceRootDirectoryPath(), configurationFilePath)))`
`23`	`23`	`{`
`24`		- output.appendLine(`tsco using configuration file ${joinPath(getWorkspaceRootDirectoryPath(), configurationFilePath)}`);
`25`		`-`
`26`	`24`	`// relative configuration file path from settings`
`27`	`25`	`return await Configuration.getConfiguration(joinPath(getWorkspaceRootDirectoryPath(), configurationFilePath));`
`28`	`26`	`}`
`29`	`27`	`else`
`30`	`28`	`{`
`31`		- output.appendLine(`tsco configuration file ${getFullPath(configurationFilePath)} not found`);
	`29`	+ log(`tsco configuration file ${getFullPath(configurationFilePath)} not found`);
`32`	`30`	`}`
`33`	`31`	`}`
`34`	`32`
`@@ -38,8 +36,6 @@ async function getConfiguration(configurationFilePath: string \| null)`
`38`	`36`
`39`	`37`	`if (await fileExists(configurationFilePath))`
`40`	`38`	`{`
`41`		- output.appendLine(`tsco using configuration file ${configurationFilePath}`);
`42`		`-`
`43`	`39`	`// look in workspace root`
`44`	`40`	`return await Configuration.getConfiguration(configurationFilePath);`
`45`	`41`	`}`
`@@ -52,13 +48,11 @@ async function getConfiguration(configurationFilePath: string \| null)`
`52`	`48`
`53`	`49`	`if (await fileExists(configurationFilePath))`
`54`	`50`	`{`
`55`		- output.appendLine(`tsco using configuration file ${configurationFilePath}`);
`56`		`-`
`57`	`51`	`return await Configuration.getConfiguration(configurationFilePath);`
`58`	`52`	`}`
`59`	`53`	`}`
`60`	`54`
`61`		`- output.appendLine("tsco using default configuration");`
	`55`	`+ log("tsco using default configuration");`
`62`	`56`
`63`	`57`	`// default configuration`
`64`	`58`	`return Configuration.getDefaultConfiguration();`
`@@ -196,12 +190,12 @@ async function organize(sourceCodeFilePath: string, configuration: Configuration`
`196`	`190`
`197`	`191`	`if (configuration.files.include.length > 0)`
`198`	`192`	`{`
`199`		`- include = configuration.files.include.some(inc => matches(inc, sourceCodeFilePathRelative) \|\| matches(inc, "./" + sourceCodeFilePathRelative));`
	`193`	`+ include = configuration.files.include.some(inc => matches(inc, sourceCodeFilePathRelative) \|\| matches(inc, sourceCodeFilePathRelative.replace("../", "").replace("./", "")));`
`200`	`194`	`}`
`201`	`195`
`202`	`196`	`if (configuration.files.exclude.length > 0)`
`203`	`197`	`{`
`204`		`- exclude = configuration.files.exclude.some(exc => matches(exc, sourceCodeFilePathRelative) \|\| matches(exc, "./" + sourceCodeFilePathRelative));`
	`198`	`+ exclude = configuration.files.exclude.some(exc => matches(exc, sourceCodeFilePathRelative) \|\| matches(exc, sourceCodeFilePathRelative.replace("../", "").replace("./", "")));`
`205`	`199`	`}`
`206`	`200`
`207`	`201`	`if (include && !exclude)`
`@@ -223,22 +217,22 @@ async function organize(sourceCodeFilePath: string, configuration: Configuration`
`223`	`217`
`224`	`218`	`await vscode.workspace.applyEdit(edit);`
`225`	`219`
`226`		- output.appendLine(`tsco organized ${sourceCodeFilePath}`);
	`220`	+ log(`tsco organized ${sourceCodeFilePath}`);
`227`	`221`
`228`	`222`	`return true;`
`229`	`223`	`}`
`230`	`224`	`else`
`231`	`225`	`{`
`232`		- output.appendLine(`tsco skipping organizing ${sourceCodeFilePath}, because it is already organized`);
	`226`	+ log(`tsco skipping organizing ${sourceCodeFilePath}, because it is already organized`);
`233`	`227`	`}`
`234`	`228`	`}`
`235`	`229`	`else if (!include)`
`236`	`230`	`{`
`237`		- output.appendLine(`tsco skipping organizing ${sourceCodeFilePath}, because it does not match file include patterns`);
	`231`	+ log(`tsco skipping organizing ${sourceCodeFilePath}, because it does not match file include patterns`);
`238`	`232`	`}`
`239`	`233`	`else if (exclude)`
`240`	`234`	`{`
`241`		- output.appendLine(`tsco skipping organizing ${sourceCodeFilePath}, because it matches file exclude patterns`);
	`235`	+ log(`tsco skipping organizing ${sourceCodeFilePath}, because it matches file exclude patterns`);
`242`	`236`	`}`
`243`	`237`
`244`	`238`	`return false;`
`@@ -256,6 +250,11 @@ export function activate(context: vscode.ExtensionContext)`
`256`	`250`
`257`	`251`	`vscode.workspace.onDidChangeConfiguration(() => settings = Settings.getSettings());`
`258`	`252`	`savingHandler = vscode.workspace.onWillSaveTextDocument(async (e) => await onSave(e.document.uri.fsPath));`
	`253`	`+`
	`254`	`+ setLogger({`
	`255`	`+ log: (message: string) => output.appendLine(message),`
	`256`	+ logError: (error: string \| Error \| unknown) => output.appendLine(`ERROR: ${error instanceof Error ? error.message : error?.toString() ?? ""}`)
	`257`	`+ });`
`259`	`258`	`}`
`260`	`259`
`261`	`260`	`// #endregion Exported Functions`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { TypeMemberType } from "../enums/type-member-type";`
`7`	`7`	`import { distinct, remove } from "../helpers/array-helper";`
`8`	`8`	`import { fileExists, readFile } from "../helpers/file-system-helper";`
`9`	`9`	`import { convertPascalCaseToTitleCase } from "../helpers/string-helper";`
	`10`	`+import { log } from "../source-code/source-code-logger";`
`10`	`11`	`import { ClassConfiguration } from "./class-configuration";`
`11`	`12`	`import { ClassMemberConfiguration } from "./class-member-configuration";`
`12`	`13`	`import { ClassMemberGroupConfiguration } from "./class-member-group-configuration";`
`@@ -55,16 +56,16 @@ export class Configuration`
`55`	`56`	`{`
`56`	`57`	`configuration = JSON.parse(await readFile(configurationFilePath));`
`57`	`58`
`58`		- console.log(`tsco using configuration ${configurationFilePath}`);
	`59`	+ log(`tsco using configuration file ${configurationFilePath}`);
`59`	`60`	`}`
`60`	`61`	`else`
`61`	`62`	`{`
`62`		`- console.log("tsco using default configuration");`
	`63`	`+ log("tsco using default configuration");`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`	`catch`
`66`	`67`	`{`
`67`		`- console.log("tsco using default configuration");`
	`68`	`+ log("tsco using default configuration");`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`return new Configuration(`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ import { getLeadingComment, getTrailingComment } from "../helpers/node-helper";`
`4`	`4`
`5`	`5`	`export abstract class ElementNode`
`6`	`6`	`{`
`7`		`- // #region Properties (4)`
	`7`	`+ // #region Properties (5)`
`8`	`8`
	`9`	`+ public readonly dependencies: string[] = [];`
`9`	`10`	`public readonly leadingComment: string \| null;`
`10`	`11`	`public abstract readonly name: string;`
`11`	`12`	`public readonly sourceCode: string;`