Merge pull request #92 from tomyitav/inner-service-bug-fix

Inner service bug fix

Author: tomyitav

package-lock.json

@@ -120,7 +120,7 @@
     "husky": "1.3.1",
     "jest": "24.0.0",
     "jest-config": "24.0.0",
-    "lint-staged": "8.1.2",
+    "lint-staged": "8.1.3",
     "lodash.camelcase": "4.3.0",
     "prettier": "1.16.3",
     "prompt": "1.0.0",

package.json

@@ -160,7 +160,10 @@ export class Service extends AbstractCommand {
   }
 
   private getServiceClassName(servicePath: string) {
-    return _.startCase(path.parse(servicePath).base.split('.')[0]) + serviceFileNameSuffix
+    return (
+      _.startCase(path.parse(servicePath).base.split('.')[0]).replace(/\W/g, '') +
+      serviceFileNameSuffix
+    )
   }
 
   private async modifyServiceDefinitionFile(

src/commands/service/service.ts

@@ -14,6 +14,7 @@ describe('test for service command', () => {
   const projectOneMissingFile = 'project-with-one-missing-file'
   const projectMissingServicesDir = 'project-with-no-services-dir'
   const projectLegalFilesNameInner = 'project-with-legal-files-inner-dir'
+  const projectLegalFilesNameInnerDash = 'project-with-legal-files-inner-dash-dir'
   const project2InnerDirs = 'project-with-2-inner-dirs'
   const cmdForCommandUndefined: ActionCmd = {
     parent: {
@@ -362,6 +363,49 @@ describe('test for service command', () => {
     compareTestFilesByPaths(pathToActualContextInterface, pathToExpectedContextInterface)
   })
 
+  it('Should update files after service command action inner dir in dash format', async () => {
+    const actualDirToCreate = path.join(pathToActualDirectory, projectLegalFilesNameInnerDash)
+    fse.mkdirsSync(actualDirToCreate)
+    fse.copySync(absPathToProjectWithLegalFile, actualDirToCreate)
+    process.chdir(actualDirToCreate)
+    const act = service.getAction()
+    await act('/inner/dir/dash-car.ts', cmdForCommandUndefined)
+    const pathToExpectedService = path.join(
+      pathToExpectedDirectory,
+      projectLegalFilesNameInnerDash,
+      'src/services/inner/dir/dash-car.ts'
+    )
+    const pathToActualService = path.join(actualDirToCreate, 'src/services/inner/dir/dash-car.ts')
+    compareTestFilesByPaths(pathToActualService, pathToExpectedService)
+
+    const pathToExpectedInjector = path.join(
+      pathToExpectedDirectory,
+      projectLegalFilesNameInnerDash,
+      'src/core/injector.ts'
+    )
+    const pathToActualInjector = path.join(actualDirToCreate, 'src/core/injector.ts')
+    compareTestFilesByPaths(pathToActualInjector, pathToExpectedInjector)
+
+    const pathToExpectedContext = path.join(
+      pathToExpectedDirectory,
+      projectLegalFilesNameInnerDash,
+      'src/context.ts'
+    )
+    const pathToActualContext = path.join(actualDirToCreate, 'src/context.ts')
+    compareTestFilesByPaths(pathToActualContext, pathToExpectedContext)
+
+    const pathToExpectedContextInterface = path.join(
+      pathToExpectedDirectory,
+      projectLegalFilesNameInnerDash,
+      'src/interfaces/IAppContext.ts'
+    )
+    const pathToActualContextInterface = path.join(
+      actualDirToCreate,
+      'src/interfaces/IAppContext.ts'
+    )
+    compareTestFilesByPaths(pathToActualContextInterface, pathToExpectedContextInterface)
+  })
+
   it('Should not override existing service file', async () => {
     const pathToExistingServiceDir = path.join(
       pathToExpectedDirectory,

test/commands/service/service.test.ts

@@ -0,0 +1,13 @@
+import { Injector } from 'injection-js'
+import { IAppContext } from './interfaces/IAppContext'
+import { TrainsService } from './services/trains/TrainsService'
+import { AbstractPubsubManager } from './graphql/subscriptions/Pubsub/AbstractPubsubManager'
+import { DashCarService } from '@src/services/inner/dir/dash-car'
+
+export function getContext(injector: Injector): IAppContext {
+  return {
+    dashCarService: injector.get(DashCarService),
+    pubsubManager: injector.get(AbstractPubsubManager),
+    trainsService: injector.get(TrainsService)
+  }
+}

test/output/expected/commands/service/project-with-legal-files-inner-dash-dir/src/context.ts

@@ -0,0 +1,23 @@
+import { Injector, ReflectiveInjector } from 'injection-js'
+import 'reflect-metadata'
+import 'zone.js'
+import { AbstractPubsubManager } from '../graphql/subscriptions/Pubsub/AbstractPubsubManager'
+import { PubsubManager } from '../graphql/subscriptions/Pubsub/PubsubManager'
+import { TrainsService } from '../services/trains/TrainsService'
+import { Server } from '../server'
+import { AbstractSetting } from './config/AbstractSetting'
+import { Setting } from './config/Setting'
+import { AbstractLogger } from './logger/AbstractLogger'
+import { Logger } from './logger/Logger'
+import { DashCarService } from '@src/services/inner/dir/dash-car'
+
+const injector: Injector = ReflectiveInjector.resolveAndCreate([
+  DashCarService,
+  { provide: AbstractLogger, useClass: Logger },
+  { provide: AbstractSetting, useClass: Setting },
+  { provide: AbstractPubsubManager, useClass: PubsubManager },
+  Server,
+  TrainsService
+])
+
+export default injector

test/output/expected/commands/service/project-with-legal-files-inner-dash-dir/src/core/injector.ts

@@ -0,0 +1,9 @@
+import { AbstractPubsubManager } from '../graphql/subscriptions/Pubsub/AbstractPubsubManager'
+import { TrainsService } from '../services/trains/TrainsService'
+import { DashCarService } from '@src/services/inner/dir/dash-car'
+
+export interface IAppContext {
+  dashCarService: DashCarService
+  pubsubManager: AbstractPubsubManager
+  trainsService: TrainsService
+}

test/output/expected/commands/service/project-with-legal-files-inner-dash-dir/src/interfaces/IAppContext.ts

@@ -0,0 +1,5 @@
+import {Injectable} from 'injection-js'
+
+@Injectable()
+export class DashCarService {
+}