Merge from tsco cli (#106)

Author: aljazsim

README.md

@@ -211,3 +211,10 @@ See [TypeScript Code Organizer Command Line Interface](https://www.npmjs.com/pac
 
 - fix issue with removing empty lines in code expressions
 - fix issue with using typed imports
+
+### 2.0.10
+
+- add setting for expanding/collapsing imports
+- 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

package.json

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

src/tsco-cli/configuration/configuration.ts

@@ -1,5 +1,6 @@
-import { ImportSourceFilePathQuoteType } from "../enums/Import-source-file-path-quote-type";
 import { ClassMemberType } from "../enums/class-member-type";
+import { ImportExpand } from "../enums/import-expand";
+import { ImportSourceFilePathQuoteType } from "../enums/import-source-file-path-quote-type";
 import { InterfaceMemberType } from "../enums/interface-member-type";
 import { ModuleMemberType } from "../enums/module-member-type";
 import { TypeMemberType } from "../enums/type-member-type";
@@ -78,7 +79,8 @@ export class Configuration
                     configuration.imports?.sortImportsByName ?? defaultConfiguration.imports.sortImportsByName,
                     configuration.imports?.groupImportsBySource ?? defaultConfiguration.imports.groupImportsBySource,
                     configuration.imports?.separateImportGroups ?? defaultConfiguration.imports.separateImportGroups,
-                    this.parseImportSourceFilePathQuoteType(configuration.imports?.quote) ?? defaultConfiguration.imports.quote
+                    this.parseImportSourceFilePathQuoteType(configuration.imports?.quote) ?? defaultConfiguration.imports.quote,
+                    this.parseImportExpand(configuration.imports?.expand) ?? defaultConfiguration.imports.expand
                 ),
             new ModuleConfiguration
                 (
@@ -159,7 +161,8 @@ export class Configuration
                     defaultConfiguration.imports.sortImportsByName,
                     defaultConfiguration.imports.groupImportsBySource,
                     defaultConfiguration.imports.separateImportGroups,
-                    this.parseImportSourceFilePathQuoteType(defaultConfiguration.imports.quote) ?? ImportSourceFilePathQuoteType.Double
+                    this.parseImportSourceFilePathQuoteType(defaultConfiguration.imports.quote) ?? ImportSourceFilePathQuoteType.Double,
+                    this.parseImportExpand(defaultConfiguration.imports.expand) ?? ImportExpand.Never
                 ),
             new ModuleConfiguration
                 (
@@ -228,7 +231,7 @@ export class Configuration
 
     // #endregion Public Static Methods
 
-    // #region Private Static Methods (9)
+    // #region Private Static Methods (10)
 
     private static fixClassMemberMemberGroup(defaultMemberTypeOrder: ClassMemberGroupConfiguration[], memberTypeOrder: ClassMemberGroupConfiguration[]): ClassMemberGroupConfiguration[]
     {
@@ -339,6 +342,26 @@ export class Configuration
         return new ClassMemberGroupConfiguration(sortDirection, caption, memberTypes, memberTypesGrouped, placeAbove, placeBelow);
     }
 
+    private static parseImportExpand(importExpand: string)
+    {
+        if (importExpand === ImportExpand.Never)
+        {
+            return ImportExpand.Never;
+        }
+        else if (importExpand === ImportExpand.Always)
+        {
+            return ImportExpand.Always;
+        }
+        else if (importExpand === ImportExpand.WhenMoreThanOneNamedImport)
+        {
+            return ImportExpand.WhenMoreThanOneNamedImport;
+        }
+        else
+        {
+            return null;
+        }
+    }
+
     private static parseImportSourceFilePathQuoteType(quoteType: string)
     {
         if (quoteType === ImportSourceFilePathQuoteType.Double)

src/tsco-cli/configuration/default-configuration.ts

@@ -1,5 +1,6 @@
-import { ImportSourceFilePathQuoteType } from "../enums/Import-source-file-path-quote-type";
 import { ClassMemberType } from "../enums/class-member-type";
+import { ImportExpand } from "../enums/import-expand";
+import { ImportSourceFilePathQuoteType } from "../enums/import-source-file-path-quote-type";
 import { InterfaceMemberType } from "../enums/interface-member-type";
 import { ModuleMemberType } from "../enums/module-member-type";
 import { TypeMemberType } from "../enums/type-member-type";
@@ -19,7 +20,8 @@ export const defaultConfiguration: Configuration =
         sortImportsByName: true,
         groupImportsBySource: true,
         separateImportGroups: true,
-        quote: ImportSourceFilePathQuoteType.Double
+        quote: ImportSourceFilePathQuoteType.Double,
+        expand: ImportExpand.Never,
     },
     modules: {
         regions: {
@@ -35,31 +37,31 @@ export const defaultConfiguration: Configuration =
             {
                 sortDirection: "asc",
                 caption: "Enums",
-                memberTypes: [ModuleMemberType.enums],
+                memberTypes: [ModuleMemberType.enums, ModuleMemberType.exportedEnums],
                 memberTypesGrouped: true,
                 placeAbove: [],
                 placeBelow: []
             },
             {
                 sortDirection: "asc",
                 caption: "Interfaces",
-                memberTypes: [ModuleMemberType.interfaces],
+                memberTypes: [ModuleMemberType.interfaces, ModuleMemberType.exportedInterfaces],
                 memberTypesGrouped: true,
                 placeAbove: [],
                 placeBelow: []
             },
             {
                 sortDirection: "asc",
                 caption: "Classes",
-                memberTypes: [ModuleMemberType.classes],
+                memberTypes: [ModuleMemberType.classes, ModuleMemberType.exportedClasses],
                 memberTypesGrouped: true,
                 placeAbove: [],
                 placeBelow: []
             },
             {
                 sortDirection: "asc",
                 caption: "Types",
-                memberTypes: [ModuleMemberType.types],
+                memberTypes: [ModuleMemberType.types, ModuleMemberType.exportedTypes],
                 memberTypesGrouped: true,
                 placeAbove: [],
                 placeBelow: []

src/tsco-cli/configuration/import-configuration.ts

@@ -1,4 +1,5 @@
-import { ImportSourceFilePathQuoteType } from "../enums/Import-source-file-path-quote-type";
+import { ImportExpand } from "../enums/import-expand";
+import { ImportSourceFilePathQuoteType } from "../enums/import-source-file-path-quote-type";
 
 export class ImportConfiguration
 {
@@ -10,7 +11,9 @@ export class ImportConfiguration
         public readonly sortImportsByName: boolean,
         public readonly groupImportsBySource: boolean,
         public readonly separateImportGroups: boolean,
-        public readonly quote: ImportSourceFilePathQuoteType)
+        public readonly quote: ImportSourceFilePathQuoteType,
+        public readonly expand: ImportExpand
+    )
     {
     }
 

src/tsco-cli/elements/class-node.ts

@@ -3,7 +3,7 @@ import * as ts from "typescript";
 import { ClassConfiguration } from "../configuration/class-configuration";
 import { ClassMemberType } from "../enums/class-member-type";
 import { WriteModifier } from "../enums/write-modifier";
-import { getDecorators, getDependencies, getIsAbstract, getIsStatic, isPrivate, isProtected, isPublic, isReadOnly, isWritable, order } from "../helpers/node-helper";
+import { getDecorators, getDependencies, getIsAbstract, getIsExport, getIsStatic, isPrivate, isProtected, isPublic, isReadOnly, isWritable, order } from "../helpers/node-helper";
 import { AccessorNode } from "./accessor-node";
 import { ConstructorNode } from "./constructor-node";
 import { ElementNode } from "./element-node";
@@ -16,14 +16,15 @@ import { StaticBlockDeclarationNode } from "./static-block-declaration-node";
 
 export class ClassNode extends ElementNode
 {
-    // #region Properties (14)
+    // #region Properties (15)
 
     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;
     public readonly isStatic: boolean;
     public readonly membersEnd: number = 0;
     public readonly membersStart: number = 0;
@@ -108,6 +109,8 @@ export class ClassNode extends ElementNode
                 }
             }
         }
+
+        this.isExport = getIsExport(classDeclaration);
     }
 
     // #endregion Constructors

src/tsco-cli/elements/enum-node.ts

@@ -1,11 +1,13 @@
 import ts from "typescript";
 
+import { getIsExport } from "../helpers/node-helper";
 import { ElementNode } from "./element-node";
 
 export class EnumNode extends ElementNode
 {
-    // #region Properties (1)
+    // #region Properties (2)
 
+    public readonly isExport: boolean;
     public readonly name: string;
 
     // #endregion Properties
@@ -17,6 +19,8 @@ export class EnumNode extends ElementNode
         super(sourceFile, enumDeclaration);
 
         this.name = (<ts.Identifier>enumDeclaration.name).escapedText?.toString() ?? sourceFile.getFullText().substring(enumDeclaration.name.pos, enumDeclaration.name.end).trim();
+
+        this.isExport = getIsExport(enumDeclaration);
     }
 
     // #endregion Constructors

src/tsco-cli/elements/interface-node.ts

@@ -2,7 +2,7 @@ import * as ts from "typescript";
 
 import { InterfaceConfiguration } from "../configuration/interface-configuration";
 import { InterfaceMemberType } from "../enums/interface-member-type";
-import { isReadOnly, isWritable, order } from "../helpers/node-helper";
+import { getIsExport, isReadOnly, isWritable, order } from "../helpers/node-helper";
 import { ElementNode } from "./element-node";
 import { ElementNodeGroup } from "./element-node-group";
 import { GetterSignatureNode } from "./getter-signature-node";
@@ -13,10 +13,11 @@ import { SetterSignatureNode } from "./setter-signature-node";
 
 export class InterfaceNode extends ElementNode
 {
-    // #region Properties (8)
+    // #region Properties (9)
 
     public readonly getters: GetterSignatureNode[] = [];
     public readonly indexes: IndexSignatureNode[] = [];
+    public readonly isExport: boolean;
     public readonly membersEnd: number = 0;
     public readonly membersStart: number = 0;
     public readonly methods: (MethodSignatureNode | PropertySignatureNode)[] = [];
@@ -73,6 +74,8 @@ export class InterfaceNode extends ElementNode
                 this.methods.push(new MethodSignatureNode(sourceFile, member));
             }
         }
+
+        this.isExport = getIsExport(interfaceDeclaration);
     }
 
     // #endregion Constructors

src/tsco-cli/elements/type-alias-node.ts

@@ -2,7 +2,7 @@ import * as ts from "typescript";
 
 import { TypeConfiguration } from "../configuration/type-configuration";
 import { TypeMemberType } from "../enums/type-member-type";
-import { order } from "../helpers/node-helper";
+import { getIsExport, order } from "../helpers/node-helper";
 import { ElementNode } from "./element-node";
 import { ElementNodeGroup } from "./element-node-group";
 import { IndexSignatureNode } from "./index-signature-node";
@@ -11,9 +11,10 @@ import { PropertySignatureNode } from "./property-signature-node";
 
 export class TypeAliasNode extends ElementNode
 {
-    // #region Properties (6)
+    // #region Properties (7)
 
     public readonly indexes: IndexSignatureNode[] = [];
+    public readonly isExport: boolean;
     public readonly membersEnd: number = 0;
     public readonly membersStart: number = 0;
     public readonly methods: MethodSignatureNode[] = [];
@@ -69,6 +70,8 @@ export class TypeAliasNode extends ElementNode
                 }
             }
         }
+
+        this.isExport = getIsExport(typeAliasDeclaration);
     }
 
     // #endregion Constructors

src/tsco-cli/elements/variable-node.ts

@@ -15,7 +15,7 @@ export class VariableNode extends ElementNode
 
     // #region Constructors (1)
 
-    constructor(sourceFile: ts.SourceFile, variableDeclaration: ts.VariableDeclaration, public readonly isExport: boolean, public readonly isConst: boolean, leadingComment: string | null, trailingComment: string | null)
+    constructor(sourceFile: ts.SourceFile, variableDeclaration: ts.VariableDeclaration, public readonly isExport: boolean, public readonly isConst: boolean, public readonly isDeclaration: boolean, leadingComment: string | null, trailingComment: string | null)
     {
         super(sourceFile, variableDeclaration, leadingComment, trailingComment);