Merge pull request #562 from sebastien-prudhomme/replace-all

Replace all hyphen characters

Author: marshallswain

src/make-find-mixin.ts

@@ -45,7 +45,7 @@ export default function makeFindMixin(options) {
     name = 'service'
   }
 
-  const nameToUse = (name || service).replace('-', '_')
+  const nameToUse = (name || service).replace(/-/g, '_')
   const prefix = getServicePrefix(nameToUse)
   const capitalized = getServiceCapitalization(nameToUse)
   const SERVICE_NAME = `${prefix}ServiceName`

src/make-get-mixin.ts

@@ -38,7 +38,7 @@ export default function makeFindMixin(options) {
     name = 'service'
   }
 
-  const nameToUse = (name || service).replace('-', '_')
+  const nameToUse = (name || service).replace(/-/g, '_')
   const singularized = inflection.singularize(nameToUse)
   const prefix = inflection.camelize(singularized, true)
   const capitalized = prefix.charAt(0).toUpperCase() + prefix.slice(1)

src/utils.ts

@@ -274,7 +274,7 @@ export function getServicePrefix(servicePath) {
   const parts = servicePath.split('/')
   let name = parts[parts.length - 1]
   // name = inflection.underscore(name)
-  name = name.replace('-', '_')
+  name = name.replace(/-/g, '_')
   name = inflection.camelize(name, true)
   return name
 }
@@ -283,7 +283,7 @@ export function getServiceCapitalization(servicePath) {
   const parts = servicePath.split('/')
   let name = parts[parts.length - 1]
   // name = inflection.underscore(name)
-  name = name.replace('-', '_')
+  name = name.replace(/-/g, '_')
   name = inflection.camelize(name)
   return name
 }

test/utils.test.ts

@@ -162,7 +162,8 @@ describe('Utils', function () {
         ['environment-Panos', 'environmentPanos'],
         ['env-panos', 'envPanos'],
         ['envPanos', 'envPanos'],
-        ['api/v1/env-panos', 'envPanos']
+        ['api/v1/env-panos', 'envPanos'],
+        ['very-long-service', 'veryLongService']
       ]
       decisionTable.forEach(([path, prefix]) => {
         assert(
@@ -181,7 +182,8 @@ describe('Utils', function () {
         ['environment-Panos', 'EnvironmentPanos'],
         ['env-panos', 'EnvPanos'],
         ['envPanos', 'EnvPanos'],
-        ['api/v1/env-panos', 'EnvPanos']
+        ['api/v1/env-panos', 'EnvPanos'],
+        ['very-long-service', 'VeryLongService']
       ]
       decisionTable.forEach(([path, prefix]) => {
         assert(