Merge pull request #13 from rintoj/feat/definition-provider-enhancements

fix: issue with organize imports not supporting alias

src/ts/create-import.ts

@@ -8,9 +8,14 @@ export function createImport(from: string, ...imports: string[]) {
           false,
           undefined,
           ts.factory.createNamedImports(
-            imports.map(item =>
-              ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(item)),
-            ),
+            imports.map(item => {
+              const [name, property] = item.split(':')
+              return ts.factory.createImportSpecifier(
+                false,
+                property ? ts.factory.createIdentifier(property) : undefined,
+                ts.factory.createIdentifier(name),
+              )
+            }),
           ),
         )
       : undefined,

src/ts/organize-import.test.ts

@@ -77,4 +77,25 @@ describe('organizeImport', () => {
     `),
     )
   })
+
+  test('to organize imports with alias', async () => {
+    const sourceFile = parseTS(`
+      import { Context, Parent, ResolveField, Resolver } from '@nestjs/graphql'
+      import { GQLContext as Context } from '../../context'
+      import { LocationService } from '../location/location.service'
+      import { StorageLocation } from './storage-location.model'
+      import { StorageLocationType } from './storage-location.type'
+      import { FieldResolver } from 'src/common/field-resolver-type'`)
+    const code = await prettify(printTS(organizeImports(sourceFile)))
+    expect(toParsedOutput(code)).toEqual(
+      toParsedOutput(`
+        import { Context, Parent, ResolveField, Resolver } from '@nestjs/graphql'
+        import { FieldResolver } from 'src/common/field-resolver-type'
+        import { GQLContext as Context } from '../../context'
+        import { LocationService } from '../location/location.service'
+        import { StorageLocation } from './storage-location.model'
+        import { StorageLocationType } from './storage-location.type'
+    `),
+    )
+  })
 })

src/ts/organize-imports.ts

@@ -27,7 +27,9 @@ export function organizeImports(sourceFile: ts.SourceFile): ts.SourceFile {
           ts.isNamedImports(statement.importClause.namedBindings)
         ) {
           statement.importClause.namedBindings.elements.map(el =>
-            importStatements[importFrom].names.add(el.name.text),
+            importStatements[importFrom].names.add(
+              [el.name.text, el.propertyName?.text].filter(Boolean).join(':'),
+            ),
           )
         }
       }