From 8c5dd53ae5b6ebbf9a36dce3a29adca57af2c628 Mon Sep 17 00:00:00 2001
From: mym0404 <mym0404@gmail.com>
Date: Tue, 12 Sep 2023 02:50:33 +0900
Subject: [PATCH] 1.0.13

---
 package.json                   | 2 +-
 src/internal/camelCase.test.ts | 1 +
 src/internal/camelCase.ts      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2040cee..8c2a278 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mj-studio/js-util",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Custom JavaScript Utilities for MJ Studio",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/src/internal/camelCase.test.ts b/src/internal/camelCase.test.ts
index 684f379..81d8a62 100644
--- a/src/internal/camelCase.test.ts
+++ b/src/internal/camelCase.test.ts
@@ -8,5 +8,6 @@ describe('convert strings to camelCase!', () => {
     expect(camelCase('_____________________   ')).toBe('');
     expect(camelCase('_________^^________mym0404 ')).toBe('^^Mym0404');
     expect(camelCase('get_challenge_by_int:challenge_id')).toBe('getChallengeByIntChallengeId');
+    expect(camelCase('get_challenge_by_int-challenge_id')).toBe('getChallengeByIntChallengeId');
   });
 });
diff --git a/src/internal/camelCase.ts b/src/internal/camelCase.ts
index 169fec9..9b5f3a6 100644
--- a/src/internal/camelCase.ts
+++ b/src/internal/camelCase.ts
@@ -7,7 +7,7 @@
 function convertCamelCaseFromSnakeCase(str: string): string {
   return str
     .trim() // 1. remove side white spaces
-    .replace(/:/g, '_')
+    .replace(/[:-]/g, '_')
     .replace(/(^_+|_+$)/g, '') // 2. remove side underscores
     .replace(/_+[a-z]/g, (word) => {
       // 3. convert snake to camel