Merge pull request #2 from TinkoffCreditSystems/add-import-to-module

feat: change the addImportToModule declaration
taiga-family · Apr 27, 2021 · 35518aa · 35518aa
2 parents 8af2b8f + 174ed99
commit 35518aa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 46 deletions.
diff --git a/libs/ng-morph/ng/helpers/add-import-to-module.spec.ts b/libs/ng-morph/ng/helpers/add-import-to-module.spec.ts
@@ -32,16 +32,15 @@ export class SomeModule {
     });
 
     it('should create the imports property', () => {
-      addImportToModule(getClasses('src/main.ts', { name: 'SomeModule' })[0], {
-        moduleName: 'TestModule',
-        moduleSpecifier: '@test/scope',
-      });
+      addImportToModule(
+        getClasses('src/main.ts', { name: 'SomeModule' })[0],
+        'TestModule'
+      );
 
       saveActiveProject();
 
       expect(host.readContent('src/main.ts'))
         .toStrictEqual(`import { NgModule } from '@angular/core';
-import { TestModule } from "@test/scope";
 
 @NgModule({
         imports: [TestModule]
@@ -66,16 +65,15 @@ export class SomeModule {
     });
 
     it('should create the imports property', () => {
-      addImportToModule(getClasses('src/main.ts', { name: 'SomeModule' })[0], {
-        moduleName: 'TestModule',
-        moduleSpecifier: '@test/scope',
-      });
+      addImportToModule(
+        getClasses('src/main.ts', { name: 'SomeModule' })[0],
+        'TestModule'
+      );
 
       saveActiveProject();
 
       expect(host.readContent('src/main.ts'))
         .toStrictEqual(`import { NgModule } from '@angular/core';
-import { TestModule } from "@test/scope";
 
 @NgModule({imports: [TestModule]})
 export class SomeModule {
@@ -101,20 +99,19 @@ export class SomeModule {
     });
 
     it('should add module to imports', () => {
-      addImportToModule(getClasses('src/main.ts', { name: 'SomeModule' })[0], {
-        moduleName: 'TestModule',
-        moduleSpecifier: '@test/scope',
-      });
+      addImportToModule(
+        getClasses('src/main.ts', { name: 'SomeModule' })[0],
+        'TestModule.forRoot()'
+      );
 
       saveActiveProject();
 
       expect(host.readContent('src/main.ts'))
         .toStrictEqual(`import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { TestModule } from "@test/scope";
 
 @NgModule({
-  imports: [CommonModule, TestModule]
+  imports: [CommonModule, TestModule.forRoot()]
 })
 export class SomeModule {
 

diff --git a/libs/ng-morph/ng/helpers/add-import-to-module.ts b/libs/ng-morph/ng/helpers/add-import-to-module.ts
@@ -1,21 +1,10 @@
 import { ClassDeclaration, Node } from 'ts-morph';
 import { getDecorators } from 'ng-morph/decorators';
-import { getImports } from 'ng-morph/imports';
 
 export function addImportToModule(
   classDeclaration: ClassDeclaration,
-  {
-    moduleName,
-    moduleSpecifier,
-    element = moduleName,
-  }: {
-    moduleName: string;
-    moduleSpecifier: string;
-    element?: string;
-  }
+  moduleName: string
 ) {
-  const file = classDeclaration.getSourceFile();
-
   const [moduleDecorator] = getDecorators(classDeclaration, {
     name: 'NgModule',
   });
@@ -41,22 +30,5 @@ export function addImportToModule(
     return;
   }
 
-  importsInitializer.addElement(element);
-
-  const [
-    moduleImport = file.addImportDeclaration({
-      moduleSpecifier,
-      namedImports: [moduleName],
-    }),
-  ] = getImports(file.getFilePath(), {
-    moduleSpecifier,
-  });
-
-  if (
-    !moduleImport
-      .getNamedImports()
-      .find((namedImport) => namedImport.getName() === moduleName)
-  ) {
-    moduleImport.addNamedImport(moduleName);
-  }
+  importsInitializer.addElement(moduleName);
 }