feat: Strip symbol when trim_icon_prefix is provided

fwh1990 · fwh1990 · commit e428ec64c0a5 · 2019-09-25T08:04:42.000+08:00
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ npx iconfont init
     "use_typescript": false,
     "save_dir": "./src/iconfont",
     "generate_mode": "all-in-one",
-    "trim_icon_prefix": "icon-",
+    "trim_icon_prefix": "icon",
     "default_icon_size": 18
 }
 ```
diff --git a/scripts/config/all-in-one-js.json b/scripts/config/all-in-one-js.json
@@ -3,6 +3,6 @@
   "use_typescript": false,
   "generate_mode": "all-in-one",
   "save_dir": "./snapshots/all-in-one-js",
-  "trim_icon_prefix": "icon-",
+  "trim_icon_prefix": "icon",
   "default_icon_size": 14
 }
diff --git a/scripts/config/all-in-one-ts.json b/scripts/config/all-in-one-ts.json
@@ -3,6 +3,6 @@
   "use_typescript": true,
   "generate_mode": "all-in-one",
   "save_dir": "./snapshots/all-in-one-ts",
-  "trim_icon_prefix": "icon-",
+  "trim_icon_prefix": "icon",
   "default_icon_size": 16
 }
diff --git a/scripts/config/depends-on-js.json b/scripts/config/depends-on-js.json
@@ -3,6 +3,6 @@
   "use_typescript": false,
   "generate_mode": "depends-on",
   "save_dir": "./snapshots/depends-on-js",
-  "trim_icon_prefix": "icon-",
+  "trim_icon_prefix": "icon",
   "default_icon_size": 18
 }
diff --git a/scripts/config/depends-on-ts.json b/scripts/config/depends-on-ts.json
@@ -3,6 +3,6 @@
   "use_typescript": true,
   "generate_mode": "depends-on",
   "save_dir": "./snapshots/depends-on-ts",
-  "trim_icon_prefix": "icon-",
+  "trim_icon_prefix": "icon",
   "default_icon_size": 20
 }
diff --git a/src/libs/generateComponent.ts b/src/libs/generateComponent.ts
@@ -60,7 +60,10 @@ export const generateComponent = (data: XmlData, config: Config) => {
     const currentSvgComponents = new Set<string>(['Svg']);
     const iconId = item.$.id;
     const iconIdAfterTrim = config.trim_icon_prefix
-      ? iconId.replace(new RegExp(`^${config.trim_icon_prefix}(.+?)$`), '$1')
+      ? iconId.replace(
+        new RegExp(`^${config.trim_icon_prefix}(.+?)$`),
+        (_, value) => value.replace(/^[-_]?(.+?)$/, '$1')
+      )
       : iconId;
     const componentName = upperFirst(camelCase(iconId));
 
diff --git a/src/libs/iconfont.json b/src/libs/iconfont.json
@@ -3,6 +3,6 @@
   "use_typescript": false,
   "save_dir": "./src/iconfont",
   "generate_mode": "all-in-one",
-  "trim_icon_prefix": "icon-",
+  "trim_icon_prefix": "icon",
   "default_icon_size": 18
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ npx iconfont init`
`59`	`59`	`"use_typescript": false,`
`60`	`60`	`"save_dir": "./src/iconfont",`
`61`	`61`	`"generate_mode": "all-in-one",`
`62`		`- "trim_icon_prefix": "icon-",`
	`62`	`+ "trim_icon_prefix": "icon",`
`63`	`63`	`"default_icon_size": 18`
`64`	`64`	`}`
`65`	`65`	```
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"use_typescript": false,`
`4`	`4`	`"generate_mode": "all-in-one",`
`5`	`5`	`"save_dir": "./snapshots/all-in-one-js",`
`6`		`- "trim_icon_prefix": "icon-",`
	`6`	`+ "trim_icon_prefix": "icon",`
`7`	`7`	`"default_icon_size": 14`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"use_typescript": true,`
`4`	`4`	`"generate_mode": "all-in-one",`
`5`	`5`	`"save_dir": "./snapshots/all-in-one-ts",`
`6`		`- "trim_icon_prefix": "icon-",`
	`6`	`+ "trim_icon_prefix": "icon",`
`7`	`7`	`"default_icon_size": 16`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"use_typescript": false,`
`4`	`4`	`"generate_mode": "depends-on",`
`5`	`5`	`"save_dir": "./snapshots/depends-on-js",`
`6`		`- "trim_icon_prefix": "icon-",`
	`6`	`+ "trim_icon_prefix": "icon",`
`7`	`7`	`"default_icon_size": 18`
`8`	`8`	`}`