From 301690b2c2473574019a291c72f4183f5b867b27 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Sun, 16 Apr 2023 16:12:30 +0800
Subject: [PATCH 01/21] done

---
 playground/src/json_view.tsx |  8 +++-
 playground/src/lrc.ts        | 17 +++++++-
 src/constants.ts             | 14 +++++++
 src/index.ts                 | 19 ++++++++-
 src/parse.ts                 | 78 ++++++++++++++++++++++++++++--------
 tsconfig.json                |  5 ++-
 6 files changed, 116 insertions(+), 25 deletions(-)

diff --git a/playground/src/json_view.tsx b/playground/src/json_view.tsx
index 1ecf3a7..0aa781d 100644
--- a/playground/src/json_view.tsx
+++ b/playground/src/json_view.tsx
@@ -1,7 +1,7 @@
 import { useMemo, useDeferredValue } from 'react';
 import styled from 'styled-components';
 import JsonView from 'react-json-view';
-import { parse } from 'clrc';
+import { LineType, LyricLine, parse } from 'clrc';
 
 const Style = styled.div`
   padding: 10px;
@@ -15,7 +15,11 @@ const Style = styled.div`
 
 const Wrapper = ({ lrc }: { lrc: string }) => {
   const deferedLrc = useDeferredValue(lrc);
-  const parsed = useMemo(() => parse(deferedLrc), [deferedLrc]);
+  const parsed = useMemo(() => parse(deferedLrc), [deferedLrc]).sort((a,b)=>{
+    const keyA = a.type === LineType.LYRIC || a.type === LineType.LYRIC_EXT  ? (a as LyricLine).startMillisecond : 0;
+    const keyB = b.type === LineType.LYRIC || b.type === LineType.LYRIC_EXT ? (b as LyricLine).startMillisecond : 0;
+    return keyA - keyB;
+  });
 
   return (
     <Style>
diff --git a/playground/src/lrc.ts b/playground/src/lrc.ts
index 5ba63bd..63b2e8f 100644
--- a/playground/src/lrc.ts
+++ b/playground/src/lrc.ts
@@ -1,10 +1,10 @@
-const lrc = `something wrong
+const lrc_old = `something wrong
 [by:mebtte]
 [ar:Greyson Chance]
 [01:17.62][00:51.80][01:43.27]Come with me for a little ride, see the shadows passing by
 [00:25.95]Look at the sun and see the clouds turn to faces in the sky
 [00:17.300]Come with me for a little ride, see the shadows passing by
-[00:34.450]We've been awake all night, shattered dreams all around  
+[00:34.450]We've been awake all night, shattered dreams all around
 [00:42.55]Close your sad, sad eyes we will be safe and sound
 [01:00.13]Look at the sun and see the clouds turn to faces in the sky
 [01:08.84]Daydreaming lightly through the rain, All's forgiven on a summer train
@@ -30,4 +30,17 @@ const lrc = `something wrong
 [03:59.39]Come away with me, it's gonna be all right you'll see, you'll see
 [04:24.46]Come away with me`;
 
+const lrc = `basking in the glow
+[by:nafeij]
+[ar:Oso Oso]
+[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>
+[00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>
+[00:38.71]I <00:39.19>felt <00:39.53>it <00:39.85>when <00:40.37>you <00:40.81>said<00:41.58>
+[00:41.83]That <00:42.34>I am <00:43.01>just <00:43.54>a <00:43.93>mess<00:44.64>
+[00:44.89]There was nothing I could do
+[00:48.40]But <00:48.70>see <00:49.04>your <00:49.40>point <00:49.82>of <00:50.10>view<00:51.00>
+[00:51.25]<00:52.03>
+[00:52.28]And <00:52.52>that's <00:52.98>the <00:53.19>truth<00:54.08>
+[00:54.33]<00:55.67>`;
+
 export default lrc;
diff --git a/src/constants.ts b/src/constants.ts
index 70862a5..fe1f36f 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -2,6 +2,7 @@
 export enum LineType {
   INVALID = 'invalid',
   LYRIC = 'lyric',
+  LYRIC_EXT = 'lyric_ext',
   METADATA = 'metadata',
 }
 
@@ -26,3 +27,16 @@ export interface LyricLine extends Line {
 export interface InvalidLine extends Line {
   type: LineType.INVALID;
 }
+
+export interface Syllable {
+  sylNumber: number;
+  raw: string;
+  startMillisecond: number;
+  content: string;
+}
+
+export interface LyricExtLine extends Line {
+  type: LineType.LYRIC_EXT;
+  startMillisecond: number;
+  content: Syllable[];
+}
diff --git a/src/index.ts b/src/index.ts
index bfba188..9a60caa 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,19 @@
-import { LineType, Line, MetadataLine, LyricLine } from './constants';
+import {
+  LineType,
+  Line,
+  MetadataLine,
+  LyricLine,
+  Syllable,
+  LyricExtLine,
+} from './constants';
 import parse from './parse';
 
-export { parse, LineType, Line, MetadataLine, LyricLine };
+export {
+  parse,
+  LineType,
+  Line,
+  MetadataLine,
+  LyricLine,
+  Syllable,
+  LyricExtLine,
+};
diff --git a/src/parse.ts b/src/parse.ts
index d4b01f7..089732e 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -1,12 +1,29 @@
-import { LineType, Line, MetadataLine, LyricLine } from './constants';
+import {
+  LineType,
+  Line,
+  MetadataLine,
+  LyricLine,
+  Syllable,
+  LyricExtLine,
+} from './constants';
+
+function toMillisecond(timeMatch: RegExpMatchArray) {
+  const minute = timeMatch[1];
+  const second = timeMatch[2];
+  const centisecond = timeMatch[3] || '00'; // compatible with [00:00]
+  const centisecondNumber =
+    centisecond.length === 3 ? +centisecond : +centisecond * 10; // // compatible with [00:00.000]
+  return +minute * 60 * 1000 + +second * 1000 + centisecondNumber;
+}
 
 /**
  * allow multiple time tag
  * [time][time]content
  */
-const LYRIC_LINE = /^((?:\[\d+:\d+(?:\.\d+)?\])+)(.*)$/;
+const LYRIC_LINE = /^((?:\[\d+:\d+(?:\.\d+)?\])+)(.*)$/; // [LYRIC_TIME]content
 const METADATA_LINE = /^\[(.+?):(.*?)\]$/; // [key:value]
 const LYRIC_TIME = /^(\d+):(\d+)(?:\.(\d+))?$/; // 00:00.00 or 00:00
+const LYRIC_EXT_TIME = /((?:<\d+:\d+(?:\.\d+)?>)+)([^<]*)/g; // <LYRIC_TIME>content
 
 /**
  * parse lrc string
@@ -26,21 +43,48 @@ function parse<MetadataKey extends string>(lrc: string) {
       const times = timesPart.split(']['); // [time1][time2] --> [time1 | time2]
       for (const time of times) {
         const timeMatch = time.replace(/(\[|\])/g, '').match(LYRIC_TIME);
-        const minute = timeMatch[1];
-        const second = timeMatch[2];
-        const centisecond = timeMatch[3] || '00'; // compatible with [00:00]
-        const centisecondNumber =
-          centisecond.length === 3 ? +centisecond : +centisecond * 10; // // compatible with [00:00.000]
-        const lyricLine: LyricLine = {
-          lineNumber: i,
-          raw,
-
-          type: LineType.LYRIC,
-          startMillisecond:
-            +minute * 60 * 1000 + +second * 1000 + centisecondNumber,
-          content: lyricMatch[2],
-        };
-        parsedLines.push(lyricLine);
+        const startMill = toMillisecond(timeMatch);
+        const extParts = [...lyricMatch[2].matchAll(LYRIC_EXT_TIME)];
+        if (extParts.length) {
+          const startLyric = lyricMatch[2].match(/^([^<]*)/)[0];
+          const syllables = extParts
+            .filter((extPart) => extPart[2].length)
+            .map((extPart, ind) => {
+              const extTimeMatch = extPart[1]
+                .replace(/(<|>)/g, '')
+                .match(LYRIC_TIME);
+              const sylStartMill = toMillisecond(extTimeMatch);
+              const syllable: Syllable = {
+                sylNumber: ind + 1,
+                raw: extPart[0],
+                startMillisecond: sylStartMill,
+                content: extPart[2],
+              };
+              return syllable;
+            });
+          syllables.splice(0, 0, {
+            sylNumber: 0,
+            raw: startLyric,
+            startMillisecond: startMill,
+            content: startLyric,
+          });
+          parsedLines.push({
+            lineNumber: i,
+            raw,
+            type: LineType.LYRIC_EXT,
+            startMillisecond: startMill,
+            content: syllables,
+          } as LyricExtLine);
+          break;
+        } else {
+          parsedLines.push({
+            lineNumber: i,
+            raw,
+            type: LineType.LYRIC,
+            startMillisecond: startMill,
+            content: lyricMatch[2],
+          } as LyricLine);
+        }
       }
 
       continue;
diff --git a/tsconfig.json b/tsconfig.json
index 10c508d..a7c2aec 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,11 @@
 {
   "compilerOptions": {
-    "lib": ["ES2015"],
+    "lib": ["ES2015", "es2020.string"],
     "outDir": "dist",
     "jsx": "react",
     "esModuleInterop": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "downlevelIteration": true
   },
   "exclude": ["./playground", "./dist"]
 }

From 75aa6e3381caec61ed420041783aa569ff302f33 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Sun, 16 Apr 2023 16:17:50 +0800
Subject: [PATCH 02/21] test

---
 package.json     | 2 +-
 src/constants.ts | 7 ++-----
 src/parse.ts     | 5 ++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index ad36114..941b399 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "dev": "tsc --declaration --watch",
     "build": "tsc --declaration",
     "lint-staged": "lint-staged",
-    "prepare": "husky install",
+    "prepare": "husky install && npm run build",
     "prepublish": "npm run build"
   },
   "repository": {
diff --git a/src/constants.ts b/src/constants.ts
index fe1f36f..ce6f9df 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -2,7 +2,6 @@
 export enum LineType {
   INVALID = 'invalid',
   LYRIC = 'lyric',
-  LYRIC_EXT = 'lyric_ext',
   METADATA = 'metadata',
 }
 
@@ -35,8 +34,6 @@ export interface Syllable {
   content: string;
 }
 
-export interface LyricExtLine extends Line {
-  type: LineType.LYRIC_EXT;
-  startMillisecond: number;
-  content: Syllable[];
+export interface LyricExtLine extends LyricLine {
+  syllables: Syllable[];
 }
diff --git a/src/parse.ts b/src/parse.ts
index 089732e..7c5d369 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -71,16 +71,15 @@ function parse<MetadataKey extends string>(lrc: string) {
           parsedLines.push({
             lineNumber: i,
             raw,
-            type: LineType.LYRIC_EXT,
             startMillisecond: startMill,
-            content: syllables,
+            content: lyricMatch[2],
+            syllables,
           } as LyricExtLine);
           break;
         } else {
           parsedLines.push({
             lineNumber: i,
             raw,
-            type: LineType.LYRIC,
             startMillisecond: startMill,
             content: lyricMatch[2],
           } as LyricLine);

From 481dad67a258396f2727e3db53711252d0a377c6 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Sun, 16 Apr 2023 16:23:56 +0800
Subject: [PATCH 03/21] parse set linetype

---
 src/parse.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/parse.ts b/src/parse.ts
index 7c5d369..8db076b 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -69,6 +69,7 @@ function parse<MetadataKey extends string>(lrc: string) {
             content: startLyric,
           });
           parsedLines.push({
+            type: LineType.LYRIC,
             lineNumber: i,
             raw,
             startMillisecond: startMill,
@@ -78,6 +79,7 @@ function parse<MetadataKey extends string>(lrc: string) {
           break;
         } else {
           parsedLines.push({
+            type: LineType.LYRIC,
             lineNumber: i,
             raw,
             startMillisecond: startMill,

From e06c1b05da2b078ea2c7c5183d490a6c106f3909 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Sun, 16 Apr 2023 18:43:53 +0800
Subject: [PATCH 04/21] clean

---
 playground/src/json_view.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/playground/src/json_view.tsx b/playground/src/json_view.tsx
index 0aa781d..1ecf3a7 100644
--- a/playground/src/json_view.tsx
+++ b/playground/src/json_view.tsx
@@ -1,7 +1,7 @@
 import { useMemo, useDeferredValue } from 'react';
 import styled from 'styled-components';
 import JsonView from 'react-json-view';
-import { LineType, LyricLine, parse } from 'clrc';
+import { parse } from 'clrc';
 
 const Style = styled.div`
   padding: 10px;
@@ -15,11 +15,7 @@ const Style = styled.div`
 
 const Wrapper = ({ lrc }: { lrc: string }) => {
   const deferedLrc = useDeferredValue(lrc);
-  const parsed = useMemo(() => parse(deferedLrc), [deferedLrc]).sort((a,b)=>{
-    const keyA = a.type === LineType.LYRIC || a.type === LineType.LYRIC_EXT  ? (a as LyricLine).startMillisecond : 0;
-    const keyB = b.type === LineType.LYRIC || b.type === LineType.LYRIC_EXT ? (b as LyricLine).startMillisecond : 0;
-    return keyA - keyB;
-  });
+  const parsed = useMemo(() => parse(deferedLrc), [deferedLrc]);
 
   return (
     <Style>

From 12e2998ffc318d2af05eb020d26712273ea8cc42 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Sun, 16 Apr 2023 22:34:51 +0800
Subject: [PATCH 05/21] docs

---
 README.md | 83 +++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 65 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 7d58fc5..2fab62e 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ LRC format parser for JavaScript/TypeScript. Here is a [playground](https://mebt
 
 ## Features
 
+- Support [enhanced lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)#Enhanced_format>)
 - Typescript support
 - Browser & Node.js support
 
@@ -18,10 +19,10 @@ npm install clrc
 ```js
 import { parse } from 'clrc';
 
-const lrc = `[ar:张叶蕾]
-something wrong
-[00:54.04]每一辆飞车彻夜向前开
-[00:58.22]飞到了路崖边永不回来`;
+const lrc = `basking in the glow
+[ar:Oso Oso]
+[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>
+[00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>;
 
 console.log(parse(lrc));
 ```
@@ -32,29 +33,75 @@ The output is:
 [
   {
     "lineNumber": 0,
-    "raw": "[ar:张叶蕾]",
-    "type": "metadata",
-    "key": "ar",
-    "value": "张叶蕾"
+    "raw": "basking in the glow",
+    "type": "invalid"
   },
   {
     "lineNumber": 1,
-    "raw": "something wrong",
-    "type": "invalid"
+    "raw": "[ar:Oso Oso]",
+    "type": "metadata",
+    "key": "ar",
+    "value": "Oso Oso"
   },
   {
-    "lineNumber": 2,
-    "raw": "[00:54.04]每一辆飞车彻夜向前开",
     "type": "lyric",
-    "startMillisecond": 54040,
-    "content": "每一辆飞车彻夜向前开"
+    "lineNumber": 2,
+    "raw": "[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>",
+    "startMillisecond": 32790,
+    "content": "Little <00:33.58>jagged <00:34.14>edge<00:35.25>",
+    "syllables": [
+      {
+        "sylNumber": 0,
+        "raw": "Little ",
+        "startMillisecond": 32790,
+        "content": "Little "
+      },
+      {
+        "sylNumber": 1,
+        "raw": "<00:33.58>jagged ",
+        "startMillisecond": 33580,
+        "content": "jagged "
+      },
+      {
+        "sylNumber": 2,
+        "raw": "<00:34.14>edge",
+        "startMillisecond": 34140,
+        "content": "edge"
+      }
+    ]
   },
   {
-    "lineNumber": 3,
-    "raw": "[00:58.22]飞到了路崖边永不回来",
     "type": "lyric",
-    "startMillisecond": 58220,
-    "content": "飞到了路崖边永不回来"
+    "lineNumber": 3,
+    "raw": "[00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>",
+    "startMillisecond": 35500,
+    "content": "I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>",
+    "syllables": [
+      {
+        "sylNumber": 0,
+        "raw": "I'm ",
+        "startMillisecond": 35500,
+        "content": "I'm "
+      },
+      {
+        "sylNumber": 1,
+        "raw": "<00:35.89>leaning ",
+        "startMillisecond": 35890,
+        "content": "leaning "
+      },
+      {
+        "sylNumber": 2,
+        "raw": "<00:36.80>in ",
+        "startMillisecond": 36800,
+        "content": "in "
+      },
+      {
+        "sylNumber": 3,
+        "raw": "<00:37.59>again",
+        "startMillisecond": 37590,
+        "content": "again"
+      }
+    ]
   }
 ]
 ```

From 92cafb9871f7ed9810e3d71de9c6c6c40b45ddb6 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Mon, 17 Apr 2023 10:32:44 +0800
Subject: [PATCH 06/21] remove filtering for end tags

---
 src/parse.ts | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/parse.ts b/src/parse.ts
index 8db076b..a0ef97f 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -47,21 +47,19 @@ function parse<MetadataKey extends string>(lrc: string) {
         const extParts = [...lyricMatch[2].matchAll(LYRIC_EXT_TIME)];
         if (extParts.length) {
           const startLyric = lyricMatch[2].match(/^([^<]*)/)[0];
-          const syllables = extParts
-            .filter((extPart) => extPart[2].length)
-            .map((extPart, ind) => {
-              const extTimeMatch = extPart[1]
-                .replace(/(<|>)/g, '')
-                .match(LYRIC_TIME);
-              const sylStartMill = toMillisecond(extTimeMatch);
-              const syllable: Syllable = {
-                sylNumber: ind + 1,
-                raw: extPart[0],
-                startMillisecond: sylStartMill,
-                content: extPart[2],
-              };
-              return syllable;
-            });
+          const syllables = extParts.map((extPart, ind) => {
+            const extTimeMatch = extPart[1]
+              .replace(/(<|>)/g, '')
+              .match(LYRIC_TIME);
+            const sylStartMill = toMillisecond(extTimeMatch);
+            const syllable: Syllable = {
+              sylNumber: ind + 1,
+              raw: extPart[0],
+              startMillisecond: sylStartMill,
+              content: extPart[2],
+            };
+            return syllable;
+          });
           syllables.splice(0, 0, {
             sylNumber: 0,
             raw: startLyric,

From 7f748aaa35260b15fb75c3ba78c7161a83d1eef7 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Thu, 20 Apr 2023 10:50:18 +0800
Subject: [PATCH 07/21] parse now supports repeated enhanced-lrc lines

---
 .eslintrc.js          | 10 ++++++
 playground/src/lrc.ts |  4 +--
 src/constants.ts      |  6 +++-
 src/parse.ts          | 78 +++++++++++++++++++++++++------------------
 tsconfig.json         |  2 +-
 5 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 358da1a..a79ed5d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -36,5 +36,15 @@ module.exports = {
         tsx: 'never',
       },
     ],
+    'prefer-destructuring': [
+      'error',
+      {
+        array: false,
+        object: true,
+      },
+      {
+        enforceForRenamedProperties: false,
+      },
+    ],
   },
 };
diff --git a/playground/src/lrc.ts b/playground/src/lrc.ts
index 63b2e8f..dd1ca68 100644
--- a/playground/src/lrc.ts
+++ b/playground/src/lrc.ts
@@ -36,11 +36,11 @@ const lrc = `basking in the glow
 [00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>
 [00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>
 [00:38.71]I <00:39.19>felt <00:39.53>it <00:39.85>when <00:40.37>you <00:40.81>said<00:41.58>
-[00:41.83]That <00:42.34>I am <00:43.01>just <00:43.54>a <00:43.93>mess<00:44.64>
+[00:41.83]That I am just a mess
 [00:44.89]There was nothing I could do
 [00:48.40]But <00:48.70>see <00:49.04>your <00:49.40>point <00:49.82>of <00:50.10>view<00:51.00>
 [00:51.25]<00:52.03>
-[00:52.28]And <00:52.52>that's <00:52.98>the <00:53.19>truth<00:54.08>
+[00:52.28]And that's <00:52.98>the <00:53.19>truth<00:54.08>
 [00:54.33]<00:55.67>`;
 
 export default lrc;
diff --git a/src/constants.ts b/src/constants.ts
index ce6f9df..5423499 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -2,6 +2,7 @@
 export enum LineType {
   INVALID = 'invalid',
   LYRIC = 'lyric',
+  LYRIC_ENH = 'lyric_enhanced',
   METADATA = 'metadata',
 }
 
@@ -34,6 +35,9 @@ export interface Syllable {
   content: string;
 }
 
-export interface LyricExtLine extends LyricLine {
+export interface LyricExtLine extends Line {
+  type: LineType.LYRIC_ENH;
+  startMillisecond: number;
+  content: string;
   syllables: Syllable[];
 }
diff --git a/src/parse.ts b/src/parse.ts
index a0ef97f..07ebf60 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -24,12 +24,17 @@ const LYRIC_LINE = /^((?:\[\d+:\d+(?:\.\d+)?\])+)(.*)$/; // [LYRIC_TIME]content
 const METADATA_LINE = /^\[(.+?):(.*?)\]$/; // [key:value]
 const LYRIC_TIME = /^(\d+):(\d+)(?:\.(\d+))?$/; // 00:00.00 or 00:00
 const LYRIC_EXT_TIME = /((?:<\d+:\d+(?:\.\d+)?>)+)([^<]*)/g; // <LYRIC_TIME>content
+const LYRIC_EXT_INNER = /((?:<\d+:\d+(?:\.\d+)?>)+)/g; // <LYRIC_TIME>
+
+function tagToTime(str: string) {
+  return toMillisecond(str.replaceAll(/[<>[\]]/g, '').match(LYRIC_TIME));
+}
 
 /**
  * parse lrc string
  * @author mebtte<hi@mebtte.com>
  */
-function parse<MetadataKey extends string>(lrc: string) {
+function parse<MetadataKey extends string>(lrc: string, { enhanced = true }) {
   const parsedLines: Line[] = [];
 
   const lines = lrc.split('\n');
@@ -38,54 +43,63 @@ function parse<MetadataKey extends string>(lrc: string) {
 
     /** lyric */
     const lyricMatch = raw.match(LYRIC_LINE);
-    if (lyricMatch) {
+    if (raw.match(LYRIC_LINE)) {
       const timesPart = lyricMatch[1]; // [time][time]content --> [time][time]
       const times = timesPart.split(']['); // [time1][time2] --> [time1 | time2]
+
+      let startLyric: string;
+      let offsets: number[];
+      let extParts: RegExpMatchArray[];
+
+      if (enhanced) {
+        startLyric = lyricMatch[2].match(/^[^<]*/)[0];
+        const startOffset = tagToTime(times[0]);
+        extParts = [...lyricMatch[2].matchAll(LYRIC_EXT_TIME)];
+        offsets = extParts.map(
+          (extPart) => tagToTime(extPart[1]) - startOffset
+        );
+      }
+
       for (const time of times) {
-        const timeMatch = time.replace(/(\[|\])/g, '').match(LYRIC_TIME);
-        const startMill = toMillisecond(timeMatch);
-        const extParts = [...lyricMatch[2].matchAll(LYRIC_EXT_TIME)];
-        if (extParts.length) {
-          const startLyric = lyricMatch[2].match(/^([^<]*)/)[0];
-          const syllables = extParts.map((extPart, ind) => {
-            const extTimeMatch = extPart[1]
-              .replace(/(<|>)/g, '')
-              .match(LYRIC_TIME);
-            const sylStartMill = toMillisecond(extTimeMatch);
-            const syllable: Syllable = {
-              sylNumber: ind + 1,
-              raw: extPart[0],
-              startMillisecond: sylStartMill,
-              content: extPart[2],
-            };
-            return syllable;
-          });
-          syllables.splice(0, 0, {
-            sylNumber: 0,
-            raw: startLyric,
-            startMillisecond: startMill,
-            content: startLyric,
-          });
+        const tagStart = tagToTime(time);
+        if (enhanced) {
+          const syllables = [
+            {
+              sylNumber: 0,
+              raw: startLyric,
+              startMillisecond: tagStart,
+              content: startLyric,
+            },
+          ];
+          syllables.push(
+            ...extParts.map(
+              (extPart, ind: number) =>
+                ({
+                  sylNumber: ind + 1,
+                  raw: extPart[0],
+                  startMillisecond: tagStart + offsets[ind],
+                  content: extPart[2],
+                } as Syllable)
+            )
+          );
           parsedLines.push({
-            type: LineType.LYRIC,
+            type: LineType.LYRIC_ENH,
             lineNumber: i,
             raw,
-            startMillisecond: startMill,
-            content: lyricMatch[2],
+            content: lyricMatch[2].replace(LYRIC_EXT_INNER, ''),
+            startMillisecond: tagStart,
             syllables,
           } as LyricExtLine);
-          break;
         } else {
           parsedLines.push({
             type: LineType.LYRIC,
             lineNumber: i,
             raw,
-            startMillisecond: startMill,
             content: lyricMatch[2],
+            startMillisecond: tagStart,
           } as LyricLine);
         }
       }
-
       continue;
     }
 
diff --git a/tsconfig.json b/tsconfig.json
index a7c2aec..8e52819 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "lib": ["ES2015", "es2020.string"],
+    "lib": ["es2021"],
     "outDir": "dist",
     "jsx": "react",
     "esModuleInterop": true,

From 991407451ba736dbc878360651ff1dc7d1b6e3f8 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Thu, 20 Apr 2023 12:01:36 +0800
Subject: [PATCH 08/21] added options interface

---
 package.json          |  1 +
 playground/src/lrc.ts |  1 +
 src/constants.ts      | 14 ++++++++++++++
 src/index.ts          |  2 ++
 src/parse.ts          | 37 ++++++++++++++++++++++++-------------
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 941b399..abea49a 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   },
   "homepage": "https://github.com/mebtte/clrc#readme",
   "devDependencies": {
+    "@types/node": "^18.15.12",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
     "@typescript-eslint/parser": "^5.36.1",
     "eslint": "^8.23.0",
diff --git a/playground/src/lrc.ts b/playground/src/lrc.ts
index dd1ca68..9093991 100644
--- a/playground/src/lrc.ts
+++ b/playground/src/lrc.ts
@@ -39,6 +39,7 @@ const lrc = `basking in the glow
 [00:41.83]That I am just a mess
 [00:44.89]There was nothing I could do
 [00:48.40]But <00:48.70>see <00:49.04>your <00:49.40>point <00:49.82>of <00:50.10>view<00:51.00>
+[00:44.89]
 [00:51.25]<00:52.03>
 [00:52.28]And that's <00:52.98>the <00:53.19>truth<00:54.08>
 [00:54.33]<00:55.67>`;
diff --git a/src/constants.ts b/src/constants.ts
index 5423499..31d1ee1 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -41,3 +41,17 @@ export interface LyricExtLine extends Line {
   content: string;
   syllables: Syllable[];
 }
+
+export interface Options {
+  /**
+   * @default false
+   * @description whether to parse syllables or words as separate objects.
+   * @see {@link https://en.wikipedia.org/wiki/LRC_(file_format)#Enhanced_format|Enhanced LRC}
+   * */
+  enhanced?: boolean;
+  /**
+   * @default false
+   * @description whether to strip empty lines.
+   * */
+  strip?: boolean;
+}
diff --git a/src/index.ts b/src/index.ts
index 9a60caa..efd5c63 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,6 +5,7 @@ import {
   LyricLine,
   Syllable,
   LyricExtLine,
+  Options,
 } from './constants';
 import parse from './parse';
 
@@ -16,4 +17,5 @@ export {
   LyricLine,
   Syllable,
   LyricExtLine,
+  Options,
 };
diff --git a/src/parse.ts b/src/parse.ts
index 07ebf60..21e49d3 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -5,6 +5,7 @@ import {
   LyricLine,
   Syllable,
   LyricExtLine,
+  Options,
 } from './constants';
 
 function toMillisecond(timeMatch: RegExpMatchArray) {
@@ -34,12 +35,15 @@ function tagToTime(str: string) {
  * parse lrc string
  * @author mebtte<hi@mebtte.com>
  */
-function parse<MetadataKey extends string>(lrc: string, { enhanced = true }) {
+function parse<MetadataKey extends string>(
+  lrc: string,
+  { enhanced = false, strip = false }: Options = {}
+) {
   const parsedLines: Line[] = [];
 
   const lines = lrc.split('\n');
-  for (let i = 0, { length } = lines; i < length; i += 1) {
-    const raw = lines[i];
+  for (let index = 0, { length } = lines; index < length; index += 1) {
+    const raw = lines[index];
 
     /** lyric */
     const lyricMatch = raw.match(LYRIC_LINE);
@@ -48,13 +52,24 @@ function parse<MetadataKey extends string>(lrc: string, { enhanced = true }) {
       const times = timesPart.split(']['); // [time1][time2] --> [time1 | time2]
 
       let startLyric: string;
+      let strippedExt: string;
       let offsets: number[];
       let extParts: RegExpMatchArray[];
 
+      if (strip && !lyricMatch[2]) {
+        continue;
+      }
+
       if (enhanced) {
         startLyric = lyricMatch[2].match(/^[^<]*/)[0];
-        const startOffset = tagToTime(times[0]);
         extParts = [...lyricMatch[2].matchAll(LYRIC_EXT_TIME)];
+
+        strippedExt = lyricMatch[2].replace(LYRIC_EXT_INNER, '');
+        if (strip && !strippedExt) {
+          continue;
+        }
+
+        const startOffset = tagToTime(times[0]);
         offsets = extParts.map(
           (extPart) => tagToTime(extPart[1]) - startOffset
         );
@@ -84,16 +99,16 @@ function parse<MetadataKey extends string>(lrc: string, { enhanced = true }) {
           );
           parsedLines.push({
             type: LineType.LYRIC_ENH,
-            lineNumber: i,
+            lineNumber: parsedLines.length,
             raw,
-            content: lyricMatch[2].replace(LYRIC_EXT_INNER, ''),
+            content: strippedExt,
             startMillisecond: tagStart,
             syllables,
           } as LyricExtLine);
         } else {
           parsedLines.push({
             type: LineType.LYRIC,
-            lineNumber: i,
+            lineNumber: parsedLines.length,
             raw,
             content: lyricMatch[2],
             startMillisecond: tagStart,
@@ -109,27 +124,23 @@ function parse<MetadataKey extends string>(lrc: string, { enhanced = true }) {
       const key = metadataMatch[1] as MetadataKey;
       const value = metadataMatch[2];
       const metadataLine: MetadataLine<MetadataKey> = {
-        lineNumber: i,
+        lineNumber: parsedLines.length,
         raw,
-
         type: LineType.METADATA,
         key,
         value,
       };
       parsedLines.push(metadataLine);
-
       continue;
     }
 
     /** invalid line */
     parsedLines.push({
-      lineNumber: i,
+      lineNumber: parsedLines.length,
       raw,
-
       type: LineType.INVALID,
     });
   }
-
   return parsedLines;
 }
 

From 88e61879d832fcea8f3345c386e7390136294ccc Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Thu, 20 Apr 2023 18:40:13 +0800
Subject: [PATCH 09/21] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2fab62e..902fe8f 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ const lrc = `basking in the glow
 [00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>
 [00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>;
 
-console.log(parse(lrc));
+console.log(parse(lrc, {enhanced: true}));
 ```
 
 The output is:
@@ -119,6 +119,7 @@ types of line:
 - `LineType.INVALID` means it's invalid line
 - `LineType.LYRIC` means it's lyric line
 - `LineType.METADATA` means it's metadata line
+- `LineType.LYRIC_ENH` means it's lyric with inline enhanced lrc tags. 
 
 ## License
 

From 9ae49b5bdf1b755d9d6c5841d8560aea22ac5781 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Mon, 24 Apr 2023 18:51:04 +0800
Subject: [PATCH 10/21] gitig

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f0981ac..2add8e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ dist/
 
 # parcel
 .cache/
+/src/unparse.ts
\ No newline at end of file

From ce0c5d62be487705a6b7ed32e57d5dc387c65ca9 Mon Sep 17 00:00:00 2001
From: mebtte <hi@mebtte.com>
Date: Tue, 25 Apr 2023 20:31:13 +0800
Subject: [PATCH 11/21] remove options.strip

---
 src/constants.ts | 5 -----
 src/parse.ts     | 9 +--------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/constants.ts b/src/constants.ts
index 31d1ee1..7c3a298 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -49,9 +49,4 @@ export interface Options {
    * @see {@link https://en.wikipedia.org/wiki/LRC_(file_format)#Enhanced_format|Enhanced LRC}
    * */
   enhanced?: boolean;
-  /**
-   * @default false
-   * @description whether to strip empty lines.
-   * */
-  strip?: boolean;
 }
diff --git a/src/parse.ts b/src/parse.ts
index 21e49d3..73cb5fe 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -37,7 +37,7 @@ function tagToTime(str: string) {
  */
 function parse<MetadataKey extends string>(
   lrc: string,
-  { enhanced = false, strip = false }: Options = {}
+  { enhanced = false }: Options = {}
 ) {
   const parsedLines: Line[] = [];
 
@@ -56,18 +56,11 @@ function parse<MetadataKey extends string>(
       let offsets: number[];
       let extParts: RegExpMatchArray[];
 
-      if (strip && !lyricMatch[2]) {
-        continue;
-      }
-
       if (enhanced) {
         startLyric = lyricMatch[2].match(/^[^<]*/)[0];
         extParts = [...lyricMatch[2].matchAll(LYRIC_EXT_TIME)];
 
         strippedExt = lyricMatch[2].replace(LYRIC_EXT_INNER, '');
-        if (strip && !strippedExt) {
-          continue;
-        }
 
         const startOffset = tagToTime(times[0]);
         offsets = extParts.map(

From 4749142d570e30c497b593903f4bb7f449e45872 Mon Sep 17 00:00:00 2001
From: mebtte <hi@mebtte.com>
Date: Tue, 25 Apr 2023 20:58:36 +0800
Subject: [PATCH 12/21] playground add options

---
 playground/package.json      |  4 ++--
 playground/src/app.tsx       | 20 +++++++++++++++++---
 playground/src/json_view.tsx |  7 +++++--
 playground/src/option.tsx    | 29 +++++++++++++++++++++++++++++
 src/constants.ts             |  6 +++---
 src/parse.ts                 |  2 +-
 6 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 playground/src/option.tsx

diff --git a/playground/package.json b/playground/package.json
index 6cc1bc3..569cef7 100644
--- a/playground/package.json
+++ b/playground/package.json
@@ -6,13 +6,13 @@
     "@types/react": "^18.0.18",
     "@types/react-dom": "^18.0.6",
     "@types/styled-components": "^5.1.26",
+    "clrc": "file:..",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-json-view": "^1.21.3",
     "react-scripts": "5.0.1",
     "styled-components": "^5.3.5",
-    "typescript": "^4.8.2",
-    "clrc": "file:.."
+    "typescript": "^4.8.2"
   },
   "scripts": {
     "dev": "react-scripts start",
diff --git a/playground/src/app.tsx b/playground/src/app.tsx
index 802d469..0945fb3 100644
--- a/playground/src/app.tsx
+++ b/playground/src/app.tsx
@@ -4,6 +4,7 @@ import demoLrc from './lrc';
 import GlobalStyle from './global_style';
 import JsonView from './json_view';
 import Github from './github';
+import Option from './option';
 
 const Style = styled.div`
   position: absolute;
@@ -13,10 +14,18 @@ const Style = styled.div`
   left: 0;
 
   display: flex;
+
+  > .editor {
+    flex: 1;
+    min-width: 0;
+
+    display: flex;
+    flex-direction: column;
+  }
 `;
 const Textarea = styled.textarea`
   flex: 1;
-  min-width: 0;
+  min-height: 0;
 
   padding: 10px;
 
@@ -29,6 +38,8 @@ const Textarea = styled.textarea`
 `;
 
 const App = () => {
+  const [enhanced, setEnhanced] = useState(false);
+
   const [lrc, setLrc] = useState(demoLrc);
   const onLrcChange = (event: React.ChangeEvent<HTMLTextAreaElement>) =>
     setLrc(event.target.value);
@@ -37,8 +48,11 @@ const App = () => {
     <>
       <GlobalStyle />
       <Style>
-        <Textarea value={lrc} onChange={onLrcChange} autoFocus />
-        <JsonView lrc={lrc} />
+        <div className="editor">
+          <Option enhanced={enhanced} onEnhancedChange={setEnhanced} />
+          <Textarea value={lrc} onChange={onLrcChange} autoFocus />
+        </div>
+        <JsonView lrc={lrc} enhanced={enhanced} />
       </Style>
       <Github />
     </>
diff --git a/playground/src/json_view.tsx b/playground/src/json_view.tsx
index 1ecf3a7..19afb24 100644
--- a/playground/src/json_view.tsx
+++ b/playground/src/json_view.tsx
@@ -13,9 +13,12 @@ const Style = styled.div`
   background-color: rgb(222 222 222 / 0.2);
 `;
 
-const Wrapper = ({ lrc }: { lrc: string }) => {
+const Wrapper = ({ lrc, enhanced }: { lrc: string; enhanced: boolean }) => {
   const deferedLrc = useDeferredValue(lrc);
-  const parsed = useMemo(() => parse(deferedLrc), [deferedLrc]);
+  const parsed = useMemo(
+    () => parse(deferedLrc, { enhanced }),
+    [deferedLrc, enhanced]
+  );
 
   return (
     <Style>
diff --git a/playground/src/option.tsx b/playground/src/option.tsx
new file mode 100644
index 0000000..cc7cb97
--- /dev/null
+++ b/playground/src/option.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const Style = styled.div`
+  padding: 10px 20px;
+`;
+
+function Option({
+  enhanced,
+  onEnhancedChange,
+}: {
+  enhanced: boolean;
+  onEnhancedChange: (e: boolean) => void;
+}) {
+  return (
+    <Style>
+      <label>
+        enhanced:
+        <input
+          type="checkbox"
+          checked={enhanced}
+          onChange={() => onEnhancedChange(!enhanced)}
+        />
+      </label>
+    </Style>
+  );
+}
+
+export default Option;
diff --git a/src/constants.ts b/src/constants.ts
index 7c3a298..523e6cc 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,9 +1,9 @@
 // eslint-disable-next-line no-shadow
 export enum LineType {
   INVALID = 'invalid',
-  LYRIC = 'lyric',
-  LYRIC_ENH = 'lyric_enhanced',
   METADATA = 'metadata',
+  LYRIC = 'lyric',
+  LYRIC_ENHANCED = 'lyric_enhanced',
 }
 
 export interface Line {
@@ -36,7 +36,7 @@ export interface Syllable {
 }
 
 export interface LyricExtLine extends Line {
-  type: LineType.LYRIC_ENH;
+  type: LineType.LYRIC_ENHANCED;
   startMillisecond: number;
   content: string;
   syllables: Syllable[];
diff --git a/src/parse.ts b/src/parse.ts
index 73cb5fe..f3cd0f7 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -91,7 +91,7 @@ function parse<MetadataKey extends string>(
             )
           );
           parsedLines.push({
-            type: LineType.LYRIC_ENH,
+            type: LineType.LYRIC_ENHANCED,
             lineNumber: parsedLines.length,
             raw,
             content: strippedExt,

From f6085e735b43bc2767cb3d9b0e96be58c1562c78 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Tue, 25 Apr 2023 21:51:45 +0800
Subject: [PATCH 13/21] add tostring & playground

---
 playground/src/app.tsx | 39 ++++++++++++++++++++++++++++++++++++---
 src/index.ts           |  2 ++
 src/toString.ts        | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 src/toString.ts

diff --git a/playground/src/app.tsx b/playground/src/app.tsx
index 802d469..1165b23 100644
--- a/playground/src/app.tsx
+++ b/playground/src/app.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
 import styled from 'styled-components';
-import demoLrc from './lrc';
+import Github from './github';
 import GlobalStyle from './global_style';
 import JsonView from './json_view';
-import Github from './github';
+import demoLrc from './lrc';
+import { parse, toString } from 'clrc';
 
 const Style = styled.div`
   position: absolute;
@@ -28,16 +29,48 @@ const Textarea = styled.textarea`
   border: 1px solid rgb(222, 222, 222);
 `;
 
+const Button = styled.button`
+  padding: 5px 10px;
+  border: 1px solid #333;
+  border-radius: 5px;
+  background-color: #fff;
+  cursor: pointer;
+  font-size: 20px;
+  max-height: 50px;
+`;
+
+const Box = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  gap: 10px;
+  padding: 10px;
+`;
+
 const App = () => {
   const [lrc, setLrc] = useState(demoLrc);
   const onLrcChange = (event: React.ChangeEvent<HTMLTextAreaElement>) =>
     setLrc(event.target.value);
 
+  const reset = () => setLrc(demoLrc);
+
+  const regenerate = () => {
+    setLrc(toString(parse(lrc)));
+  };
+
   return (
     <>
       <GlobalStyle />
       <Style>
-        <Textarea value={lrc} onChange={onLrcChange} autoFocus />
+        <Box>
+          <Textarea value={lrc} onChange={onLrcChange} autoFocus />
+          <Button onClick={reset}>
+            Reset
+          </Button>
+          <Button onClick={regenerate}>
+            Regenerate
+          </Button>
+        </Box>
         <JsonView lrc={lrc} />
       </Style>
       <Github />
diff --git a/src/index.ts b/src/index.ts
index efd5c63..5a6e7e0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,6 +8,7 @@ import {
   Options,
 } from './constants';
 import parse from './parse';
+import toString from './toString';
 
 export {
   parse,
@@ -18,4 +19,5 @@ export {
   Syllable,
   LyricExtLine,
   Options,
+  toString,
 };
diff --git a/src/toString.ts b/src/toString.ts
new file mode 100644
index 0000000..4b84779
--- /dev/null
+++ b/src/toString.ts
@@ -0,0 +1,34 @@
+import { Line, LineType, LyricExtLine, LyricLine } from './constants';
+
+function toMMSSmmm(millisecond: number) {
+  let minutes: String | number = Math.floor(millisecond / 60000);
+  let seconds: String | number = Math.floor((millisecond % 60000) / 1000);
+  let ms: String | number = Math.round(millisecond % 1000);
+
+  minutes = `0${minutes}`.slice(-2);
+  seconds = `0${seconds}`.slice(-2);
+  ms = `000${ms}`.slice(-3);
+  return `${minutes}:${seconds}.${ms}`;
+}
+
+export default function toString(lrc: Line[]) {
+  const strings = lrc.map((line) => {
+    if (line.type === LineType.LYRIC_ENH) {
+      const lineExt = line as LyricExtLine;
+      const content = [];
+      content.push(`[${toMMSSmmm(lineExt.startMillisecond)}]`);
+      content.push(lineExt.syllables[0].content);
+      lineExt.syllables.forEach((syl, i) => {
+        if (i === 0) return;
+        content.push(`<${toMMSSmmm(syl.startMillisecond)}>${syl.content}`);
+      });
+      return content.join('');
+    }
+    if (line.type === LineType.LYRIC) {
+      const lineN = line as LyricLine;
+      return `[${toMMSSmmm(lineN.startMillisecond)}]${lineN.content}`;
+    }
+    return line.raw;
+  });
+  return strings.join('\n');
+}

From d35862f3f2123ac6d944c3329ad192c30c6b17aa Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Tue, 25 Apr 2023 22:16:20 +0800
Subject: [PATCH 14/21] add functions toString and expand

---
 playground/src/app.tsx    | 34 +++++++++++++++-------------------
 playground/src/lrc.ts     | 33 +++++++++++++++++++++------------
 playground/src/option.tsx |  2 +-
 src/expand.ts             |  6 ++++++
 src/index.ts              |  2 ++
 src/toString.ts           | 16 ++++++++++++++--
 6 files changed, 59 insertions(+), 34 deletions(-)
 create mode 100644 src/expand.ts

diff --git a/playground/src/app.tsx b/playground/src/app.tsx
index 8f8b99e..dcd89b4 100644
--- a/playground/src/app.tsx
+++ b/playground/src/app.tsx
@@ -1,10 +1,10 @@
+import { expand } from 'clrc';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 import Github from './github';
 import GlobalStyle from './global_style';
 import JsonView from './json_view';
 import demoLrc from './lrc';
-import { parse, toString } from 'clrc';
 import Option from './option';
 
 const Style = styled.div`
@@ -22,6 +22,12 @@ const Style = styled.div`
 
     display: flex;
     flex-direction: column;
+
+    > .toolbar {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
   }
 `;
 const Textarea = styled.textarea`
@@ -44,29 +50,21 @@ const Button = styled.button`
   border-radius: 5px;
   background-color: #fff;
   cursor: pointer;
-  font-size: 20px;
   max-height: 50px;
 `;
 
-const Box = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  gap: 10px;
-  padding: 10px;
-`;
-
 const App = () => {
   const [enhanced, setEnhanced] = useState(false);
 
   const [lrc, setLrc] = useState(demoLrc);
+
   const onLrcChange = (event: React.ChangeEvent<HTMLTextAreaElement>) =>
     setLrc(event.target.value);
 
   const reset = () => setLrc(demoLrc);
 
-  const regenerate = () => {
-    setLrc(toString(parse(lrc)));
+  const handleExpand = () => {
+    setLrc(expand(lrc));
   };
 
   return (
@@ -74,14 +72,12 @@ const App = () => {
       <GlobalStyle />
       <Style>
         <div className="editor">
-          <Option enhanced={enhanced} onEnhancedChange={setEnhanced} />
+          <div className="toolbar">
+            <Option enhanced={enhanced} onEnhancedChange={setEnhanced} />
+            <Button onClick={reset}>Reset</Button>
+            <Button onClick={handleExpand}>Regenerate</Button>
+          </div>
           <Textarea value={lrc} onChange={onLrcChange} autoFocus />
-          <Button onClick={reset}>
-            Reset
-          </Button>
-          <Button onClick={regenerate}>
-            Regenerate
-          </Button>
         </div>
         <JsonView lrc={lrc} enhanced={enhanced} />
       </Style>
diff --git a/playground/src/lrc.ts b/playground/src/lrc.ts
index 9093991..319838e 100644
--- a/playground/src/lrc.ts
+++ b/playground/src/lrc.ts
@@ -30,18 +30,27 @@ const lrc_old = `something wrong
 [03:59.39]Come away with me, it's gonna be all right you'll see, you'll see
 [04:24.46]Come away with me`;
 
-const lrc = `basking in the glow
+const lrc = `Gold
 [by:nafeij]
-[ar:Oso Oso]
-[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>
-[00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>
-[00:38.71]I <00:39.19>felt <00:39.53>it <00:39.85>when <00:40.37>you <00:40.81>said<00:41.58>
-[00:41.83]That I am just a mess
-[00:44.89]There was nothing I could do
-[00:48.40]But <00:48.70>see <00:49.04>your <00:49.40>point <00:49.82>of <00:50.10>view<00:51.00>
-[00:44.89]
-[00:51.25]<00:52.03>
-[00:52.28]And that's <00:52.98>the <00:53.19>truth<00:54.08>
-[00:54.33]<00:55.67>`;
+[ar:Chet Faker]
+[00:19.51][00:33.09][00:39.72][00:46.53][01:55.07][02:09.05][03:17.35][03:31.19][03:44.95]You <00:19.73>gotta <00:20.18>know, <00:21.29>I'm <00:21.55>feeling <00:22.19>love <00:22.66>
+[00:23.13][00:50.18][01:58.75][02:12.41][03:20.93][03:34.72][03:48.43]Made <00:23.43>of <00:23.59>gold, <00:24.71>I <00:24.90>never <00:25.29>loved <00:25.61>a <00:25.89>
+[00:26.59][00:53.45][02:02.14][02:15.78][03:24.38][03:37.94][03:51.83]Another <00:27.04>one, <00:28.18>another <00:28.87>you <00:29.45>
+[00:29.88][00:56.94][02:05.51][02:19.26][03:27.74][03:41.58][03:55.38]It's <00:30.07>gotta <00:30.56>be <00:31.70>love <00:32.00>I <00:32.17>said <00:32.55>it<00:33.07>
+[01:00.68]I <01:00.91>might <01:01.15>as <01:01.39>well <01:01.60>be <01:01.81>in <01:02.01>a <01:02.25>garden <01:06.26>
+[01:06.26]I <01:06.51>said, <01:06.71>ah <01:07.17>
+[01:07.53]A <01:07.62>smell <01:08.00>in <01:08.18>the <01:08.44>air <01:09.17>is <01:09.33>a <01:09.46>dripping <01:09.95>rose<01:10.41>
+[01:10.41](You <01:10.92>could <01:11.23>be <01:11.70>the <01:12.07>one <01:12.72>for <01:12.94>me) <01:13.73>
+[01:14.41]Another <01:14.96>soul <01:15.27>to <01:15.45>meet <01:15.72>my <01:16.01>void <01:16.60>then <01:17.82>
+[01:18.14][03:58.09]♪ <01:20.62>
+[01:21.33]Of <01:21.49>anything <01:22.14>bare <01:22.83>that's <01:23.08>made <01:23.71>of <01:23.93>gold <01:26.12>
+[01:28.10][02:50.05]A <01:28.39>physical <01:29.16>kiss <01:29.91>is <01:30.07>nothing <01:30.68>without <01:31.38>it <01:32.29>
+[01:35.01][02:56.76]And <01:35.25>you <01:35.44>close <01:35.76>your <01:36.03>eyes <01:36.77>to <01:36.94>see <01:37.19>what <01:37.51>it's <01:37.79>done <01:38.72>
+[01:41.84][03:03.51]The <01:42.06>body <01:42.66>that <01:42.84>lies <01:43.51>is <01:43.81>built <01:44.06>up <01:44.29>on <01:44.66>looking <01:45.64>
+[01:48.71][03:10.55]'Cause <01:48.96>all <01:49.23>that <01:49.46>remains <01:50.44>before <01:50.94>it's <01:51.25>begun <01:52.79>
+[02:23.02]A <02:23.21>heart <02:23.47>will <02:23.64>swell <02:24.12>before <02:24.75>it's <02:25.14>hardened <02:26.57>
+[02:29.65]With <02:29.86>the <02:29.97>flick <02:30.28>of <02:30.46>the <02:30.78>hair, <02:31.24>it <02:31.46>can <02:31.86>make <02:32.14>you <02:32.53>old <02:33.26>
+[02:37.19]Another <02:37.72>hole <02:38.04>to <02:38.24>dig <02:38.49>my <02:38.69>soul <02:39.32>in <02:39.85>
+[02:43.31]I'll <02:43.59>leave <02:43.82>anything <02:44.47>bare <02:45.04>that <02:45.28>keeps <02:45.80>me <02:46.25>soul <02:47.81>`;
 
 export default lrc;
diff --git a/playground/src/option.tsx b/playground/src/option.tsx
index cc7cb97..d07389c 100644
--- a/playground/src/option.tsx
+++ b/playground/src/option.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 const Style = styled.div`
-  padding: 10px 20px;
+  padding: 10px 10px 10px 20px;
 `;
 
 function Option({
diff --git a/src/expand.ts b/src/expand.ts
new file mode 100644
index 0000000..43f7ba3
--- /dev/null
+++ b/src/expand.ts
@@ -0,0 +1,6 @@
+import parse from './parse';
+import toString from './toString';
+
+export default function expand(lrc: string) {
+  return toString(parse(lrc));
+}
diff --git a/src/index.ts b/src/index.ts
index 5a6e7e0..7865211 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,6 +9,7 @@ import {
 } from './constants';
 import parse from './parse';
 import toString from './toString';
+import expand from './expand';
 
 export {
   parse,
@@ -20,4 +21,5 @@ export {
   LyricExtLine,
   Options,
   toString,
+  expand,
 };
diff --git a/src/toString.ts b/src/toString.ts
index 4b84779..8b3710c 100644
--- a/src/toString.ts
+++ b/src/toString.ts
@@ -11,9 +11,21 @@ function toMMSSmmm(millisecond: number) {
   return `${minutes}:${seconds}.${ms}`;
 }
 
+type Timed = LyricLine | LyricExtLine;
+function isTimed(line: Line): line is Timed {
+  return line.type === LineType.LYRIC || line.type === LineType.LYRIC_ENHANCED;
+}
+
+function selectiveSort(a: Line, b: Line) {
+  if (isTimed(a) && isTimed(b)) {
+    return a.startMillisecond - b.startMillisecond;
+  }
+  return 0;
+}
+
 export default function toString(lrc: Line[]) {
-  const strings = lrc.map((line) => {
-    if (line.type === LineType.LYRIC_ENH) {
+  const strings = lrc.sort(selectiveSort).map((line) => {
+    if (line.type === LineType.LYRIC_ENHANCED) {
       const lineExt = line as LyricExtLine;
       const content = [];
       content.push(`[${toMMSSmmm(lineExt.startMillisecond)}]`);

From 2a2d721470e6efc4c616bf42abc8be3c3e855df8 Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Tue, 25 Apr 2023 22:30:00 +0800
Subject: [PATCH 15/21] Update README.md

---
 README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 902fe8f..7e4fdfc 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,15 @@ The output is:
 
 ### parse(lrcString)
 
-parse lrc string to array.
+parse lrc string to Line array.
+
+### toString(Line[])
+
+parse Line array back into valid lrc string.
+
+### expand(lrcString)
+
+returns new lrc string with all repeating lyrics inserted into separate lines.
 
 ### LineType
 
@@ -119,7 +127,7 @@ types of line:
 - `LineType.INVALID` means it's invalid line
 - `LineType.LYRIC` means it's lyric line
 - `LineType.METADATA` means it's metadata line
-- `LineType.LYRIC_ENH` means it's lyric with inline enhanced lrc tags. 
+- `LineType.LYRIC_ENHANCED` means it's lyric with inline enhanced lrc tags. 
 
 ## License
 

From c955ce2227429b19345bbf6acfe76db320bddc0b Mon Sep 17 00:00:00 2001
From: Wang Jiefan <wng.jiefan@gmail.com>
Date: Tue, 25 Apr 2023 22:31:40 +0800
Subject: [PATCH 16/21] Update README.md

---
 README.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7e4fdfc..4957617 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,11 @@ The output is:
     "value": "Oso Oso"
   },
   {
-    "type": "lyric",
+    "type": "lyric_enhanced",
     "lineNumber": 2,
     "raw": "[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>",
+    "content": "Little jagged edge",
     "startMillisecond": 32790,
-    "content": "Little <00:33.58>jagged <00:34.14>edge<00:35.25>",
     "syllables": [
       {
         "sylNumber": 0,
@@ -67,15 +67,54 @@ The output is:
         "raw": "<00:34.14>edge",
         "startMillisecond": 34140,
         "content": "edge"
+      },
+      {
+        "sylNumber": 3,
+        "raw": "<00:35.25>",
+        "startMillisecond": 35250,
+        "content": ""
       }
     ]
   },
   {
-    "type": "lyric",
+    "type": "lyric_enhanced",
     "lineNumber": 3,
+    "raw": "[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>",
+    "content": "Little jagged edge",
+    "startMillisecond": 56000,
+    "syllables": [
+      {
+        "sylNumber": 0,
+        "raw": "Little ",
+        "startMillisecond": 56000,
+        "content": "Little "
+      },
+      {
+        "sylNumber": 1,
+        "raw": "<00:33.58>jagged ",
+        "startMillisecond": 56790,
+        "content": "jagged "
+      },
+      {
+        "sylNumber": 2,
+        "raw": "<00:34.14>edge",
+        "startMillisecond": 57350,
+        "content": "edge"
+      },
+      {
+        "sylNumber": 3,
+        "raw": "<00:35.25>",
+        "startMillisecond": 58460,
+        "content": ""
+      }
+    ]
+  },
+  {
+    "type": "lyric_enhanced",
+    "lineNumber": 4,
     "raw": "[00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>",
+    "content": "I'm leaning in again",
     "startMillisecond": 35500,
-    "content": "I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>",
     "syllables": [
       {
         "sylNumber": 0,
@@ -100,6 +139,12 @@ The output is:
         "raw": "<00:37.59>again",
         "startMillisecond": 37590,
         "content": "again"
+      },
+      {
+        "sylNumber": 4,
+        "raw": "<00:38.46>",
+        "startMillisecond": 38460,
+        "content": ""
       }
     ]
   }

From e5fe2ac83e0d0213439599f8bac3fce429866571 Mon Sep 17 00:00:00 2001
From: mebtte <hi@mebtte.com>
Date: Wed, 26 Apr 2023 18:23:25 +0800
Subject: [PATCH 17/21] remove expand

---
 playground/src/app.tsx | 28 +---------------------------
 src/expand.ts          |  6 ------
 src/index.ts           |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 src/expand.ts

diff --git a/playground/src/app.tsx b/playground/src/app.tsx
index dcd89b4..ee771d6 100644
--- a/playground/src/app.tsx
+++ b/playground/src/app.tsx
@@ -1,4 +1,3 @@
-import { expand } from 'clrc';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 import Github from './github';
@@ -22,12 +21,6 @@ const Style = styled.div`
 
     display: flex;
     flex-direction: column;
-
-    > .toolbar {
-      display: flex;
-      align-items: center;
-      gap: 10px;
-    }
   }
 `;
 const Textarea = styled.textarea`
@@ -44,15 +37,6 @@ const Textarea = styled.textarea`
   border: 1px solid rgb(222, 222, 222);
 `;
 
-const Button = styled.button`
-  padding: 5px 10px;
-  border: 1px solid #333;
-  border-radius: 5px;
-  background-color: #fff;
-  cursor: pointer;
-  max-height: 50px;
-`;
-
 const App = () => {
   const [enhanced, setEnhanced] = useState(false);
 
@@ -61,22 +45,12 @@ const App = () => {
   const onLrcChange = (event: React.ChangeEvent<HTMLTextAreaElement>) =>
     setLrc(event.target.value);
 
-  const reset = () => setLrc(demoLrc);
-
-  const handleExpand = () => {
-    setLrc(expand(lrc));
-  };
-
   return (
     <>
       <GlobalStyle />
       <Style>
         <div className="editor">
-          <div className="toolbar">
-            <Option enhanced={enhanced} onEnhancedChange={setEnhanced} />
-            <Button onClick={reset}>Reset</Button>
-            <Button onClick={handleExpand}>Regenerate</Button>
-          </div>
+          <Option enhanced={enhanced} onEnhancedChange={setEnhanced} />
           <Textarea value={lrc} onChange={onLrcChange} autoFocus />
         </div>
         <JsonView lrc={lrc} enhanced={enhanced} />
diff --git a/src/expand.ts b/src/expand.ts
deleted file mode 100644
index 43f7ba3..0000000
--- a/src/expand.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import parse from './parse';
-import toString from './toString';
-
-export default function expand(lrc: string) {
-  return toString(parse(lrc));
-}
diff --git a/src/index.ts b/src/index.ts
index 7865211..5a6e7e0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,7 +9,6 @@ import {
 } from './constants';
 import parse from './parse';
 import toString from './toString';
-import expand from './expand';
 
 export {
   parse,
@@ -21,5 +20,4 @@ export {
   LyricExtLine,
   Options,
   toString,
-  expand,
 };

From 134d38e6ce50f6f71a14be4ac4f926f02cfc721f Mon Sep 17 00:00:00 2001
From: mebtte <hi@mebtte.com>
Date: Thu, 27 Apr 2023 14:23:28 +0800
Subject: [PATCH 18/21] parse enhanced to parseEnhanced

---
 .eslintrc.js                 |   1 +
 playground/src/app.tsx       |  13 ++--
 playground/src/data.ts       |  39 ++++++++++++
 playground/src/json_view.tsx |   4 +-
 playground/src/lrc.ts        |  56 -----------------
 src/constants.ts             |  23 ++-----
 src/index.ts                 |  14 ++---
 src/parse.ts                 | 119 +++++++----------------------------
 src/parse_enhanced.ts        |  89 ++++++++++++++++++++++++++
 src/toString.ts              |  14 ++---
 src/utils.ts                 |  11 ++++
 tsconfig.json                |   7 +--
 12 files changed, 196 insertions(+), 194 deletions(-)
 create mode 100644 playground/src/data.ts
 delete mode 100644 playground/src/lrc.ts
 create mode 100644 src/parse_enhanced.ts
 create mode 100644 src/utils.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index a79ed5d..4ef67d3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -25,6 +25,7 @@ module.exports = {
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': 'error',
 
+    'import/prefer-default-export': 'off',
     'import/no-extraneous-dependencies': 'off',
     'no-restricted-syntax': 'off',
     'no-continue': 'off',
diff --git a/playground/src/app.tsx b/playground/src/app.tsx
index ee771d6..e1d54de 100644
--- a/playground/src/app.tsx
+++ b/playground/src/app.tsx
@@ -1,9 +1,9 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import Github from './github';
 import GlobalStyle from './global_style';
 import JsonView from './json_view';
-import demoLrc from './lrc';
+import { lrc as lrcDemo, enhancedLrc as enhancedLrcDemo } from './data';
 import Option from './option';
 
 const Style = styled.div`
@@ -38,13 +38,16 @@ const Textarea = styled.textarea`
 `;
 
 const App = () => {
-  const [enhanced, setEnhanced] = useState(false);
-
-  const [lrc, setLrc] = useState(demoLrc);
+  const [enhanced, setEnhanced] = useState(true);
 
+  const [lrc, setLrc] = useState(enhanced ? enhancedLrcDemo : lrcDemo);
   const onLrcChange = (event: React.ChangeEvent<HTMLTextAreaElement>) =>
     setLrc(event.target.value);
 
+  useEffect(() => {
+    setLrc(enhanced ? enhancedLrcDemo : lrcDemo);
+  }, [enhanced]);
+
   return (
     <>
       <GlobalStyle />
diff --git a/playground/src/data.ts b/playground/src/data.ts
new file mode 100644
index 0000000..10c4792
--- /dev/null
+++ b/playground/src/data.ts
@@ -0,0 +1,39 @@
+export const lrc = `something wrong
+[by:mebtte]
+[ar:Greyson Chance]
+[01:17.62][00:51.80][01:43.27]Come with me for a little ride, see the shadows passing by
+[00:25.95]Look at the sun and see the clouds turn to faces in the sky
+[00:17.300]Come with me for a little ride, see the shadows passing by
+[00:34.450]We've been awake all night, shattered dreams all around  
+[00:42.55]Close your sad, sad eyes we will be safe and sound
+[01:00.13]Look at the sun and see the clouds turn to faces in the sky
+[01:08.84]Daydreaming lightly through the rain, All's forgiven on a summer train
+[01:25.69]Seems we are a thousand miles away from last night
+[01:34.29]As you sigh in my ear, kiss the rain goodbye
+[01:51.79]Look at the sun and see the clouds turn to faces in the sky
+[02:00.38]Daydreaming lightly through the rain
+[02:04.73]All's forgiven on a summer train
+[02:09.04]Come with me for a little ride, see the shadows passing by
+[02:16.56]Come away with me, it's gonna be all right just breathe
+[02:25.01]Come away with me, it's gonna be all right you'll see
+[02:34.62]And the windows are cryin'  but this train is flyin'  us all through the rain I feel
+[02:42.82]And the sky is getting brighter with every mile
+[02:47.07]And it all seems clear
+[03:00.59]Come with me for a little ride, see the shadows passing by
+[03:09.16]Look at the sun and see the clouds turn to faces in the sky
+[03:17.78]Daydreaming lightly through the rain
+[03:22.32]All's forgiven on a summer train
+[03:26.45]Come with me for a little ride, see the shadows passing by
+[03:34.32]Come away with me, it's gonna be all right just breathe
+[03:42.08]Come away with me, it's gonna be all right you'll see
+[03:51.31]Come away with me, it's gonna be all right just breathe
+[03:59.39]Come away with me, it's gonna be all right you'll see, you'll see
+[04:24.46]Come away with me`;
+
+// from https://en.wikipedia.org/wiki/LRC_(file_format)#Enhanced_format|Enhanced%20LRC
+export const enhancedLrc = `[by: lrc-maker]
+[ti: Somebody to Love]
+
+[00:00.00] <00:00.04> When <00:00.16> the <00:00.82> truth <00:01.29> is <00:01.63> found <00:03.09> to <00:03.37> be <00:05.92> lies 
+[00:06.47] <00:07.67> And <00:07.94> all <00:08.36> the <00:08.63> joy <00:10.28> within <00:10.53> you <00:13.09> dies 
+[00:13.34] <00:14.32> Don't <00:14.73> you <00:15.14> want <00:15.57> somebody <00:16.09> to <00:16.46> love`;
diff --git a/playground/src/json_view.tsx b/playground/src/json_view.tsx
index 19afb24..2db1b18 100644
--- a/playground/src/json_view.tsx
+++ b/playground/src/json_view.tsx
@@ -1,7 +1,7 @@
 import { useMemo, useDeferredValue } from 'react';
 import styled from 'styled-components';
 import JsonView from 'react-json-view';
-import { parse } from 'clrc';
+import { parse, parseEnhanced } from 'clrc';
 
 const Style = styled.div`
   padding: 10px;
@@ -16,7 +16,7 @@ const Style = styled.div`
 const Wrapper = ({ lrc, enhanced }: { lrc: string; enhanced: boolean }) => {
   const deferedLrc = useDeferredValue(lrc);
   const parsed = useMemo(
-    () => parse(deferedLrc, { enhanced }),
+    () => (enhanced ? parseEnhanced(deferedLrc) : parse(deferedLrc)),
     [deferedLrc, enhanced]
   );
 
diff --git a/playground/src/lrc.ts b/playground/src/lrc.ts
deleted file mode 100644
index 319838e..0000000
--- a/playground/src/lrc.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-const lrc_old = `something wrong
-[by:mebtte]
-[ar:Greyson Chance]
-[01:17.62][00:51.80][01:43.27]Come with me for a little ride, see the shadows passing by
-[00:25.95]Look at the sun and see the clouds turn to faces in the sky
-[00:17.300]Come with me for a little ride, see the shadows passing by
-[00:34.450]We've been awake all night, shattered dreams all around
-[00:42.55]Close your sad, sad eyes we will be safe and sound
-[01:00.13]Look at the sun and see the clouds turn to faces in the sky
-[01:08.84]Daydreaming lightly through the rain, All's forgiven on a summer train
-[01:25.69]Seems we are a thousand miles away from last night
-[01:34.29]As you sigh in my ear, kiss the rain goodbye
-[01:51.79]Look at the sun and see the clouds turn to faces in the sky
-[02:00.38]Daydreaming lightly through the rain
-[02:04.73]All's forgiven on a summer train
-[02:09.04]Come with me for a little ride, see the shadows passing by
-[02:16.56]Come away with me, it's gonna be all right just breathe
-[02:25.01]Come away with me, it's gonna be all right you'll see
-[02:34.62]And the windows are cryin'  but this train is flyin'  us all through the rain I feel
-[02:42.82]And the sky is getting brighter with every mile
-[02:47.07]And it all seems clear
-[03:00.59]Come with me for a little ride, see the shadows passing by
-[03:09.16]Look at the sun and see the clouds turn to faces in the sky
-[03:17.78]Daydreaming lightly through the rain
-[03:22.32]All's forgiven on a summer train
-[03:26.45]Come with me for a little ride, see the shadows passing by
-[03:34.32]Come away with me, it's gonna be all right just breathe
-[03:42.08]Come away with me, it's gonna be all right you'll see
-[03:51.31]Come away with me, it's gonna be all right just breathe
-[03:59.39]Come away with me, it's gonna be all right you'll see, you'll see
-[04:24.46]Come away with me`;
-
-const lrc = `Gold
-[by:nafeij]
-[ar:Chet Faker]
-[00:19.51][00:33.09][00:39.72][00:46.53][01:55.07][02:09.05][03:17.35][03:31.19][03:44.95]You <00:19.73>gotta <00:20.18>know, <00:21.29>I'm <00:21.55>feeling <00:22.19>love <00:22.66>
-[00:23.13][00:50.18][01:58.75][02:12.41][03:20.93][03:34.72][03:48.43]Made <00:23.43>of <00:23.59>gold, <00:24.71>I <00:24.90>never <00:25.29>loved <00:25.61>a <00:25.89>
-[00:26.59][00:53.45][02:02.14][02:15.78][03:24.38][03:37.94][03:51.83]Another <00:27.04>one, <00:28.18>another <00:28.87>you <00:29.45>
-[00:29.88][00:56.94][02:05.51][02:19.26][03:27.74][03:41.58][03:55.38]It's <00:30.07>gotta <00:30.56>be <00:31.70>love <00:32.00>I <00:32.17>said <00:32.55>it<00:33.07>
-[01:00.68]I <01:00.91>might <01:01.15>as <01:01.39>well <01:01.60>be <01:01.81>in <01:02.01>a <01:02.25>garden <01:06.26>
-[01:06.26]I <01:06.51>said, <01:06.71>ah <01:07.17>
-[01:07.53]A <01:07.62>smell <01:08.00>in <01:08.18>the <01:08.44>air <01:09.17>is <01:09.33>a <01:09.46>dripping <01:09.95>rose<01:10.41>
-[01:10.41](You <01:10.92>could <01:11.23>be <01:11.70>the <01:12.07>one <01:12.72>for <01:12.94>me) <01:13.73>
-[01:14.41]Another <01:14.96>soul <01:15.27>to <01:15.45>meet <01:15.72>my <01:16.01>void <01:16.60>then <01:17.82>
-[01:18.14][03:58.09]♪ <01:20.62>
-[01:21.33]Of <01:21.49>anything <01:22.14>bare <01:22.83>that's <01:23.08>made <01:23.71>of <01:23.93>gold <01:26.12>
-[01:28.10][02:50.05]A <01:28.39>physical <01:29.16>kiss <01:29.91>is <01:30.07>nothing <01:30.68>without <01:31.38>it <01:32.29>
-[01:35.01][02:56.76]And <01:35.25>you <01:35.44>close <01:35.76>your <01:36.03>eyes <01:36.77>to <01:36.94>see <01:37.19>what <01:37.51>it's <01:37.79>done <01:38.72>
-[01:41.84][03:03.51]The <01:42.06>body <01:42.66>that <01:42.84>lies <01:43.51>is <01:43.81>built <01:44.06>up <01:44.29>on <01:44.66>looking <01:45.64>
-[01:48.71][03:10.55]'Cause <01:48.96>all <01:49.23>that <01:49.46>remains <01:50.44>before <01:50.94>it's <01:51.25>begun <01:52.79>
-[02:23.02]A <02:23.21>heart <02:23.47>will <02:23.64>swell <02:24.12>before <02:24.75>it's <02:25.14>hardened <02:26.57>
-[02:29.65]With <02:29.86>the <02:29.97>flick <02:30.28>of <02:30.46>the <02:30.78>hair, <02:31.24>it <02:31.46>can <02:31.86>make <02:32.14>you <02:32.53>old <02:33.26>
-[02:37.19]Another <02:37.72>hole <02:38.04>to <02:38.24>dig <02:38.49>my <02:38.69>soul <02:39.32>in <02:39.85>
-[02:43.31]I'll <02:43.59>leave <02:43.82>anything <02:44.47>bare <02:45.04>that <02:45.28>keeps <02:45.80>me <02:46.25>soul <02:47.81>`;
-
-export default lrc;
diff --git a/src/constants.ts b/src/constants.ts
index 523e6cc..00736ef 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -3,7 +3,7 @@ export enum LineType {
   INVALID = 'invalid',
   METADATA = 'metadata',
   LYRIC = 'lyric',
-  LYRIC_ENHANCED = 'lyric_enhanced',
+  ENHANCED_LYRIC = 'enhanced_lyric',
 }
 
 export interface Line {
@@ -28,25 +28,14 @@ export interface InvalidLine extends Line {
   type: LineType.INVALID;
 }
 
-export interface Syllable {
-  sylNumber: number;
+export interface EnhancedWord {
+  index: number;
   raw: string;
   startMillisecond: number;
   content: string;
 }
 
-export interface LyricExtLine extends Line {
-  type: LineType.LYRIC_ENHANCED;
-  startMillisecond: number;
-  content: string;
-  syllables: Syllable[];
-}
-
-export interface Options {
-  /**
-   * @default false
-   * @description whether to parse syllables or words as separate objects.
-   * @see {@link https://en.wikipedia.org/wiki/LRC_(file_format)#Enhanced_format|Enhanced LRC}
-   * */
-  enhanced?: boolean;
+export interface EnhancedLyricLine extends Omit<LyricLine, 'type'> {
+  type: LineType.ENHANCED_LYRIC;
+  words: EnhancedWord[];
 }
diff --git a/src/index.ts b/src/index.ts
index 5a6e7e0..bf7c6f5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,21 +3,21 @@ import {
   Line,
   MetadataLine,
   LyricLine,
-  Syllable,
-  LyricExtLine,
-  Options,
+  EnhancedLyricLine,
+  EnhancedWord,
 } from './constants';
 import parse from './parse';
+import parseEnhanced from './parse_enhanced';
 import toString from './toString';
 
 export {
   parse,
+  parseEnhanced,
+  toString,
   LineType,
   Line,
   MetadataLine,
   LyricLine,
-  Syllable,
-  LyricExtLine,
-  Options,
-  toString,
+  EnhancedLyricLine,
+  EnhancedWord,
 };
diff --git a/src/parse.ts b/src/parse.ts
index f3cd0f7..7a4a1b2 100644
--- a/src/parse.ts
+++ b/src/parse.ts
@@ -1,113 +1,38 @@
-import {
-  LineType,
-  Line,
-  MetadataLine,
-  LyricLine,
-  Syllable,
-  LyricExtLine,
-  Options,
-} from './constants';
+import { LineType, MetadataLine, LyricLine, InvalidLine } from './constants';
+import { timestampToMillsecond } from './utils';
 
-function toMillisecond(timeMatch: RegExpMatchArray) {
-  const minute = timeMatch[1];
-  const second = timeMatch[2];
-  const centisecond = timeMatch[3] || '00'; // compatible with [00:00]
-  const centisecondNumber =
-    centisecond.length === 3 ? +centisecond : +centisecond * 10; // // compatible with [00:00.000]
-  return +minute * 60 * 1000 + +second * 1000 + centisecondNumber;
-}
-
-/**
- * allow multiple time tag
- * [time][time]content
- */
-const LYRIC_LINE = /^((?:\[\d+:\d+(?:\.\d+)?\])+)(.*)$/; // [LYRIC_TIME]content
+const LYRIC_LINE = /^((?:\[\d{2,}:\d{2}(?:\.\d{2,3})?\])+)(.*)$/; // [time]content | [time][time][...]content
 const METADATA_LINE = /^\[(.+?):(.*?)\]$/; // [key:value]
-const LYRIC_TIME = /^(\d+):(\d+)(?:\.(\d+))?$/; // 00:00.00 or 00:00
-const LYRIC_EXT_TIME = /((?:<\d+:\d+(?:\.\d+)?>)+)([^<]*)/g; // <LYRIC_TIME>content
-const LYRIC_EXT_INNER = /((?:<\d+:\d+(?:\.\d+)?>)+)/g; // <LYRIC_TIME>
-
-function tagToTime(str: string) {
-  return toMillisecond(str.replaceAll(/[<>[\]]/g, '').match(LYRIC_TIME));
-}
 
 /**
  * parse lrc string
  * @author mebtte<hi@mebtte.com>
  */
-function parse<MetadataKey extends string>(
-  lrc: string,
-  { enhanced = false }: Options = {}
-) {
-  const parsedLines: Line[] = [];
+function parse<MetadataKey extends string>(lrc: string) {
+  const parsedLines: (InvalidLine | MetadataLine<MetadataKey> | LyricLine)[] =
+    [];
 
   const lines = lrc.split('\n');
-  for (let index = 0, { length } = lines; index < length; index += 1) {
-    const raw = lines[index];
+  for (let i = 0, { length } = lines; i < length; i += 1) {
+    const raw = lines[i];
 
     /** lyric */
     const lyricMatch = raw.match(LYRIC_LINE);
-    if (raw.match(LYRIC_LINE)) {
+    if (lyricMatch) {
       const timesPart = lyricMatch[1]; // [time][time]content --> [time][time]
       const times = timesPart.split(']['); // [time1][time2] --> [time1 | time2]
+      for (const time of times) {
+        const lyricLine: LyricLine = {
+          lineNumber: i,
+          raw,
 
-      let startLyric: string;
-      let strippedExt: string;
-      let offsets: number[];
-      let extParts: RegExpMatchArray[];
-
-      if (enhanced) {
-        startLyric = lyricMatch[2].match(/^[^<]*/)[0];
-        extParts = [...lyricMatch[2].matchAll(LYRIC_EXT_TIME)];
-
-        strippedExt = lyricMatch[2].replace(LYRIC_EXT_INNER, '');
-
-        const startOffset = tagToTime(times[0]);
-        offsets = extParts.map(
-          (extPart) => tagToTime(extPart[1]) - startOffset
-        );
+          type: LineType.LYRIC,
+          startMillisecond: timestampToMillsecond(time.replace(/[[\]]/g, '')),
+          content: lyricMatch[2],
+        };
+        parsedLines.push(lyricLine);
       }
 
-      for (const time of times) {
-        const tagStart = tagToTime(time);
-        if (enhanced) {
-          const syllables = [
-            {
-              sylNumber: 0,
-              raw: startLyric,
-              startMillisecond: tagStart,
-              content: startLyric,
-            },
-          ];
-          syllables.push(
-            ...extParts.map(
-              (extPart, ind: number) =>
-                ({
-                  sylNumber: ind + 1,
-                  raw: extPart[0],
-                  startMillisecond: tagStart + offsets[ind],
-                  content: extPart[2],
-                } as Syllable)
-            )
-          );
-          parsedLines.push({
-            type: LineType.LYRIC_ENHANCED,
-            lineNumber: parsedLines.length,
-            raw,
-            content: strippedExt,
-            startMillisecond: tagStart,
-            syllables,
-          } as LyricExtLine);
-        } else {
-          parsedLines.push({
-            type: LineType.LYRIC,
-            lineNumber: parsedLines.length,
-            raw,
-            content: lyricMatch[2],
-            startMillisecond: tagStart,
-          } as LyricLine);
-        }
-      }
       continue;
     }
 
@@ -117,23 +42,27 @@ function parse<MetadataKey extends string>(
       const key = metadataMatch[1] as MetadataKey;
       const value = metadataMatch[2];
       const metadataLine: MetadataLine<MetadataKey> = {
-        lineNumber: parsedLines.length,
+        lineNumber: i,
         raw,
+
         type: LineType.METADATA,
         key,
         value,
       };
       parsedLines.push(metadataLine);
+
       continue;
     }
 
     /** invalid line */
     parsedLines.push({
-      lineNumber: parsedLines.length,
+      lineNumber: i,
       raw,
+
       type: LineType.INVALID,
     });
   }
+
   return parsedLines;
 }
 
diff --git a/src/parse_enhanced.ts b/src/parse_enhanced.ts
new file mode 100644
index 0000000..8fb214d
--- /dev/null
+++ b/src/parse_enhanced.ts
@@ -0,0 +1,89 @@
+import {
+  EnhancedLyricLine,
+  InvalidLine,
+  LineType,
+  MetadataLine,
+  EnhancedWord,
+} from './constants';
+import parse from './parse';
+import { timestampToMillsecond } from './utils';
+
+/**
+ * <00:00.000>
+ * <00:00.00>
+ * <00:00>
+ */
+const ENHANCED_TIME = /<\d{2,}:\d{2}(?:\.(?:\d{2,3}))?>/g;
+
+function parseEnhanced<MetadataKey extends string>(
+  lrc: string
+): (InvalidLine | MetadataLine<MetadataKey> | EnhancedLyricLine)[] {
+  const lines = parse<MetadataKey>(lrc);
+  return lines.map((line) => {
+    if (line.type === LineType.LYRIC) {
+      const words: EnhancedWord[] = [];
+
+      const wordTimeTagMatch = line.content.match(ENHANCED_TIME);
+
+      if (!wordTimeTagMatch) {
+        /**
+         * no time tag but having content is invalid
+         * like [time] xxxxx
+         * @author mebtte<hi@mebtte.com>
+         */
+        if (line.content.trim().length) {
+          return {
+            type: LineType.INVALID,
+            lineNumber: line.lineNumber,
+            raw: line.raw,
+          } as InvalidLine;
+        }
+      } else {
+        const wordContents = line.content.split(ENHANCED_TIME);
+
+        /**
+         * ignore first emptiness or only-space
+         * @author mebtte<hi@mebtte.com>
+         */
+        if (wordContents[0].trim().length === 0) {
+          wordContents.shift();
+        }
+
+        /**
+         * time tag' length should equal to content's length
+         * @author mebtte<hi@mebtte.com>
+         */
+        if (wordTimeTagMatch.length !== wordContents.length) {
+          return {
+            type: LineType.INVALID,
+            lineNumber: line.lineNumber,
+            raw: line.raw,
+          } as InvalidLine;
+        }
+
+        for (let i = 0; i < wordTimeTagMatch.length; i += 1) {
+          const timestamp = wordTimeTagMatch[i];
+          const content = wordContents[i];
+          words.push({
+            index: i,
+            raw: `${timestamp}${content}`,
+            startMillisecond: timestampToMillsecond(
+              timestamp.replace(/[<>]/g, '')
+            ),
+            content,
+          });
+        }
+      }
+
+      return {
+        ...line,
+        type: LineType.ENHANCED_LYRIC,
+        words,
+      };
+    }
+
+    return line;
+  });
+}
+
+export default parseEnhanced;
diff --git a/src/toString.ts b/src/toString.ts
index 8b3710c..b3f44f6 100644
--- a/src/toString.ts
+++ b/src/toString.ts
@@ -1,4 +1,4 @@
-import { Line, LineType, LyricExtLine, LyricLine } from './constants';
+import { Line, LineType, EnhancedLyricLine, LyricLine } from './constants';
 
 function toMMSSmmm(millisecond: number) {
   let minutes: String | number = Math.floor(millisecond / 60000);
@@ -11,9 +11,9 @@ function toMMSSmmm(millisecond: number) {
   return `${minutes}:${seconds}.${ms}`;
 }
 
-type Timed = LyricLine | LyricExtLine;
+type Timed = LyricLine | EnhancedLyricLine;
 function isTimed(line: Line): line is Timed {
-  return line.type === LineType.LYRIC || line.type === LineType.LYRIC_ENHANCED;
+  return line.type === LineType.LYRIC || line.type === LineType.ENHANCED_LYRIC;
 }
 
 function selectiveSort(a: Line, b: Line) {
@@ -25,12 +25,12 @@ function selectiveSort(a: Line, b: Line) {
 
 export default function toString(lrc: Line[]) {
   const strings = lrc.sort(selectiveSort).map((line) => {
-    if (line.type === LineType.LYRIC_ENHANCED) {
-      const lineExt = line as LyricExtLine;
+    if (line.type === LineType.ENHANCED_LYRIC) {
+      const lineExt = line as EnhancedLyricLine;
       const content = [];
       content.push(`[${toMMSSmmm(lineExt.startMillisecond)}]`);
-      content.push(lineExt.syllables[0].content);
-      lineExt.syllables.forEach((syl, i) => {
+      content.push(lineExt.words[0].content);
+      lineExt.words.forEach((syl, i) => {
         if (i === 0) return;
         content.push(`<${toMMSSmmm(syl.startMillisecond)}>${syl.content}`);
       });
diff --git a/src/utils.ts b/src/utils.ts
new file mode 100644
index 0000000..bbfc6bf
--- /dev/null
+++ b/src/utils.ts
@@ -0,0 +1,11 @@
+const TIMESTAMP = /^(\d{2,}):(\d{2})(?:\.(\d{2,3}))?$/; // 00:00.000 | 00:00.00 | 00:00
+
+export function timestampToMillsecond(timestamp: string) {
+  const timeMatch = timestamp.match(TIMESTAMP);
+  const minute = timeMatch[1];
+  const second = timeMatch[2];
+  const centisecond = timeMatch[3] || '00'; // compatible with [00:00]
+  const centisecondNumber =
+    centisecond.length === 3 ? +centisecond : +centisecond * 10; // // compatible with [00:00.000]
+  return +minute * 60 * 1000 + +second * 1000 + centisecondNumber;
+}
diff --git a/tsconfig.json b/tsconfig.json
index 8e52819..e11d32e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,8 @@
 {
   "compilerOptions": {
-    "lib": ["es2021"],
+    "lib": ["ES2015"],
     "outDir": "dist",
-    "jsx": "react",
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "downlevelIteration": true
+    "skipLibCheck": true
   },
   "exclude": ["./playground", "./dist"]
 }

From 6004143006c99fdb8e9b9743c51f4dc568f3bc20 Mon Sep 17 00:00:00 2001
From: mebtte <hi@mebtte.com>
Date: Thu, 27 Apr 2023 15:07:25 +0800
Subject: [PATCH 19/21] toString to stringify

---
 playground/src/app.tsx       |  7 +++---
 playground/src/json_view.tsx | 15 ++++++++----
 src/index.ts                 |  4 ++--
 src/stringify.ts             | 17 +++++++++++++
 src/toString.ts              | 46 ------------------------------------
 5 files changed, 33 insertions(+), 56 deletions(-)
 create mode 100644 src/stringify.ts
 delete mode 100644 src/toString.ts

diff --git a/playground/src/app.tsx b/playground/src/app.tsx
index e1d54de..0532650 100644
--- a/playground/src/app.tsx
+++ b/playground/src/app.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useDeferredValue, useEffect, useState } from 'react';
 import styled from 'styled-components';
 import Github from './github';
 import GlobalStyle from './global_style';
@@ -38,7 +38,7 @@ const Textarea = styled.textarea`
 `;
 
 const App = () => {
-  const [enhanced, setEnhanced] = useState(true);
+  const [enhanced, setEnhanced] = useState(false);
 
   const [lrc, setLrc] = useState(enhanced ? enhancedLrcDemo : lrcDemo);
   const onLrcChange = (event: React.ChangeEvent<HTMLTextAreaElement>) =>
@@ -48,6 +48,7 @@ const App = () => {
     setLrc(enhanced ? enhancedLrcDemo : lrcDemo);
   }, [enhanced]);
 
+  const deferedLrc = useDeferredValue(lrc);
   return (
     <>
       <GlobalStyle />
@@ -56,7 +57,7 @@ const App = () => {
           <Option enhanced={enhanced} onEnhancedChange={setEnhanced} />
           <Textarea value={lrc} onChange={onLrcChange} autoFocus />
         </div>
-        <JsonView lrc={lrc} enhanced={enhanced} />
+        <JsonView lrc={deferedLrc} enhanced={enhanced} />
       </Style>
       <Github />
     </>
diff --git a/playground/src/json_view.tsx b/playground/src/json_view.tsx
index 2db1b18..2fe470a 100644
--- a/playground/src/json_view.tsx
+++ b/playground/src/json_view.tsx
@@ -1,7 +1,7 @@
-import { useMemo, useDeferredValue } from 'react';
+import { useMemo, useEffect } from 'react';
 import styled from 'styled-components';
 import JsonView from 'react-json-view';
-import { parse, parseEnhanced } from 'clrc';
+import { parse, parseEnhanced, stringify } from 'clrc';
 
 const Style = styled.div`
   padding: 10px;
@@ -14,12 +14,17 @@ const Style = styled.div`
 `;
 
 const Wrapper = ({ lrc, enhanced }: { lrc: string; enhanced: boolean }) => {
-  const deferedLrc = useDeferredValue(lrc);
   const parsed = useMemo(
-    () => (enhanced ? parseEnhanced(deferedLrc) : parse(deferedLrc)),
-    [deferedLrc, enhanced]
+    () => (enhanced ? parseEnhanced(lrc) : parse(lrc)),
+    [lrc, enhanced]
   );
 
+  useEffect(() => {
+    console.group('stringify from parsed result');
+    console.log(stringify(parsed));
+    console.groupEnd();
+  }, [parsed]);
+
   return (
     <Style>
       <JsonView src={parsed} />
diff --git a/src/index.ts b/src/index.ts
index bf7c6f5..5d2085e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,12 +8,12 @@ import {
 } from './constants';
 import parse from './parse';
 import parseEnhanced from './parse_enhanced';
-import toString from './toString';
+import stringify from './stringify';
 
 export {
   parse,
   parseEnhanced,
-  toString,
+  stringify,
   LineType,
   Line,
   MetadataLine,
diff --git a/src/stringify.ts b/src/stringify.ts
new file mode 100644
index 0000000..b952441
--- /dev/null
+++ b/src/stringify.ts
@@ -0,0 +1,17 @@
+import { Line } from './constants';
+
+function stringify(lines: Line[]) {
+  const usedLineNumber: { [key: number]: true } = {};
+  return lines
+    .filter((line) => {
+      if (usedLineNumber[line.lineNumber]) {
+        return false;
+      }
+      usedLineNumber[line.lineNumber] = true;
+      return true;
+    })
+    .map((line) => line.raw)
+    .join('\n');
+}
+
+export default stringify;
diff --git a/src/toString.ts b/src/toString.ts
deleted file mode 100644
index b3f44f6..0000000
--- a/src/toString.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Line, LineType, EnhancedLyricLine, LyricLine } from './constants';
-
-function toMMSSmmm(millisecond: number) {
-  let minutes: String | number = Math.floor(millisecond / 60000);
-  let seconds: String | number = Math.floor((millisecond % 60000) / 1000);
-  let ms: String | number = Math.round(millisecond % 1000);
-
-  minutes = `0${minutes}`.slice(-2);
-  seconds = `0${seconds}`.slice(-2);
-  ms = `000${ms}`.slice(-3);
-  return `${minutes}:${seconds}.${ms}`;
-}
-
-type Timed = LyricLine | EnhancedLyricLine;
-function isTimed(line: Line): line is Timed {
-  return line.type === LineType.LYRIC || line.type === LineType.ENHANCED_LYRIC;
-}
-
-function selectiveSort(a: Line, b: Line) {
-  if (isTimed(a) && isTimed(b)) {
-    return a.startMillisecond - b.startMillisecond;
-  }
-  return 0;
-}
-
-export default function toString(lrc: Line[]) {
-  const strings = lrc.sort(selectiveSort).map((line) => {
-    if (line.type === LineType.ENHANCED_LYRIC) {
-      const lineExt = line as EnhancedLyricLine;
-      const content = [];
-      content.push(`[${toMMSSmmm(lineExt.startMillisecond)}]`);
-      content.push(lineExt.words[0].content);
-      lineExt.words.forEach((syl, i) => {
-        if (i === 0) return;
-        content.push(`<${toMMSSmmm(syl.startMillisecond)}>${syl.content}`);
-      });
-      return content.join('');
-    }
-    if (line.type === LineType.LYRIC) {
-      const lineN = line as LyricLine;
-      return `[${toMMSSmmm(lineN.startMillisecond)}]${lineN.content}`;
-    }
-    return line.raw;
-  });
-  return strings.join('\n');
-}

From ad5396a5d1e01c272844e3da33010cd62e42834b Mon Sep 17 00:00:00 2001
From: mebtte <hi@mebtte.com>
Date: Mon, 8 May 2023 12:28:49 +0800
Subject: [PATCH 20/21] remove stringify

---
 playground/src/json_view.tsx | 10 ++--------
 src/index.ts                 |  2 --
 src/stringify.ts             | 17 -----------------
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 src/stringify.ts

diff --git a/playground/src/json_view.tsx b/playground/src/json_view.tsx
index 2fe470a..114560f 100644
--- a/playground/src/json_view.tsx
+++ b/playground/src/json_view.tsx
@@ -1,7 +1,7 @@
-import { useMemo, useEffect } from 'react';
+import { useMemo } from 'react';
 import styled from 'styled-components';
 import JsonView from 'react-json-view';
-import { parse, parseEnhanced, stringify } from 'clrc';
+import { parse, parseEnhanced } from 'clrc';
 
 const Style = styled.div`
   padding: 10px;
@@ -19,12 +19,6 @@ const Wrapper = ({ lrc, enhanced }: { lrc: string; enhanced: boolean }) => {
     [lrc, enhanced]
   );
 
-  useEffect(() => {
-    console.group('stringify from parsed result');
-    console.log(stringify(parsed));
-    console.groupEnd();
-  }, [parsed]);
-
   return (
     <Style>
       <JsonView src={parsed} />
diff --git a/src/index.ts b/src/index.ts
index 5d2085e..dcedcf1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,12 +8,10 @@ import {
 } from './constants';
 import parse from './parse';
 import parseEnhanced from './parse_enhanced';
-import stringify from './stringify';
 
 export {
   parse,
   parseEnhanced,
-  stringify,
   LineType,
   Line,
   MetadataLine,
diff --git a/src/stringify.ts b/src/stringify.ts
deleted file mode 100644
index b952441..0000000
--- a/src/stringify.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Line } from './constants';
-
-function stringify(lines: Line[]) {
-  const usedLineNumber: { [key: number]: true } = {};
-  return lines
-    .filter((line) => {
-      if (usedLineNumber[line.lineNumber]) {
-        return false;
-      }
-      usedLineNumber[line.lineNumber] = true;
-      return true;
-    })
-    .map((line) => line.raw)
-    .join('\n');
-}
-
-export default stringify;

From 4b6d2345070715eeca9ad9a28bcbf5bfaa5373e0 Mon Sep 17 00:00:00 2001
From: mebtte <hi@mebtte.com>
Date: Mon, 8 May 2023 14:18:57 +0800
Subject: [PATCH 21/21] update readme

---
 README.md | 209 +++++++++++++++++++++++++-----------------------------
 1 file changed, 98 insertions(+), 111 deletions(-)

diff --git a/README.md b/README.md
index 4957617..ddee4ea 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 # clrc [![version](https://img.shields.io/npm/v/clrc)](https://www.npmjs.com/package/clrc) [![license](https://img.shields.io/npm/l/clrc)](https://github.com/mebtte/react-lrc/blob/master/LICENSE) [![](https://img.shields.io/bundlephobia/minzip/clrc)](https://bundlephobia.com/result?p=clrc)
 
-LRC format parser for JavaScript/TypeScript. Here is a [playground](https://mebtte.github.io/clrc).
+Parser for LRC and enhanced LRC. Here is a [playground](https://mebtte.github.io/clrc).
 
 [2.x README](https://github.com/mebtte/clrc/blob/5c6efcbbfe08d4021e0a7d6252088c5deca428f7/README.md)
 
 ## Features
 
-- Support [enhanced lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)#Enhanced_format>)
 - Typescript support
 - Browser & Node.js support
+- Simple format and enhanced format support
 
 ## Install & Usage
 
@@ -19,12 +19,12 @@ npm install clrc
 ```js
 import { parse } from 'clrc';
 
-const lrc = `basking in the glow
-[ar:Oso Oso]
-[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>
-[00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>;
+const lrc = `[ar:张叶蕾]
+something wrong
+[00:54.04]每一辆飞车彻夜向前开
+[00:58.22]飞到了路崖边永不回来`;
 
-console.log(parse(lrc, {enhanced: true}));
+console.log(parse(lrc));
 ```
 
 The output is:
@@ -33,146 +33,133 @@ The output is:
 [
   {
     "lineNumber": 0,
-    "raw": "basking in the glow",
-    "type": "invalid"
+    "raw": "[ar:张叶蕾]",
+    "type": "metadata",
+    "key": "ar",
+    "value": "张叶蕾"
   },
   {
     "lineNumber": 1,
-    "raw": "[ar:Oso Oso]",
-    "type": "metadata",
-    "key": "ar",
-    "value": "Oso Oso"
+    "raw": "something wrong",
+    "type": "invalid"
   },
   {
-    "type": "lyric_enhanced",
     "lineNumber": 2,
-    "raw": "[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>",
-    "content": "Little jagged edge",
-    "startMillisecond": 32790,
-    "syllables": [
-      {
-        "sylNumber": 0,
-        "raw": "Little ",
-        "startMillisecond": 32790,
-        "content": "Little "
-      },
-      {
-        "sylNumber": 1,
-        "raw": "<00:33.58>jagged ",
-        "startMillisecond": 33580,
-        "content": "jagged "
-      },
-      {
-        "sylNumber": 2,
-        "raw": "<00:34.14>edge",
-        "startMillisecond": 34140,
-        "content": "edge"
-      },
-      {
-        "sylNumber": 3,
-        "raw": "<00:35.25>",
-        "startMillisecond": 35250,
-        "content": ""
-      }
-    ]
+    "raw": "[00:54.04]每一辆飞车彻夜向前开",
+    "type": "lyric",
+    "startMillisecond": 54040,
+    "content": "每一辆飞车彻夜向前开"
   },
   {
-    "type": "lyric_enhanced",
     "lineNumber": 3,
-    "raw": "[00:32.79][00:56.00]Little <00:33.58>jagged <00:34.14>edge<00:35.25>",
-    "content": "Little jagged edge",
-    "startMillisecond": 56000,
-    "syllables": [
+    "raw": "[00:58.22]飞到了路崖边永不回来",
+    "type": "lyric",
+    "startMillisecond": 58220,
+    "content": "飞到了路崖边永不回来"
+  }
+]
+```
+
+## Reference
+
+### parse(lrcString)
+
+parse lrc string to array.
+
+### parseEnhanced(lrcString)
+
+parse enhanced lrc string to array. here is a example:
+
+```txt
+[ti: Somebody to Love]
+[00:00.00] <00:00.04> When <00:00.16> the <00:00.82> truth <00:01.29> is <00:01.63> found <00:03.09> to <00:03.37> be <00:05.92> lies
+```
+
+the output is:
+
+```json
+[
+  {
+    "lineNumber": 0,
+    "raw": "[ti: Somebody to Love]",
+    "type": "metadata",
+    "key": "ti",
+    "value": " Somebody to Love"
+  },
+  {
+    "lineNumber": 1,
+    "raw": "[00:00.00] <00:00.04> When <00:00.16> the <00:00.82> truth <00:01.29> is <00:01.63> found <00:03.09> to <00:03.37> be <00:05.92> lies ",
+    "type": "enhanced_lyric",
+    "startMillisecond": 0,
+    "content": " <00:00.04> When <00:00.16> the <00:00.82> truth <00:01.29> is <00:01.63> found <00:03.09> to <00:03.37> be <00:05.92> lies ",
+    "words": [
       {
-        "sylNumber": 0,
-        "raw": "Little ",
-        "startMillisecond": 56000,
-        "content": "Little "
+        "index": 0,
+        "raw": "<00:00.04> When ",
+        "startMillisecond": 40,
+        "content": " When "
       },
       {
-        "sylNumber": 1,
-        "raw": "<00:33.58>jagged ",
-        "startMillisecond": 56790,
-        "content": "jagged "
+        "index": 1,
+        "raw": "<00:00.16> the ",
+        "startMillisecond": 160,
+        "content": " the "
       },
       {
-        "sylNumber": 2,
-        "raw": "<00:34.14>edge",
-        "startMillisecond": 57350,
-        "content": "edge"
+        "index": 2,
+        "raw": "<00:00.82> truth ",
+        "startMillisecond": 820,
+        "content": " truth "
       },
       {
-        "sylNumber": 3,
-        "raw": "<00:35.25>",
-        "startMillisecond": 58460,
-        "content": ""
-      }
-    ]
-  },
-  {
-    "type": "lyric_enhanced",
-    "lineNumber": 4,
-    "raw": "[00:35.50]I'm <00:35.89>leaning <00:36.80>in <00:37.59>again<00:38.46>",
-    "content": "I'm leaning in again",
-    "startMillisecond": 35500,
-    "syllables": [
-      {
-        "sylNumber": 0,
-        "raw": "I'm ",
-        "startMillisecond": 35500,
-        "content": "I'm "
+        "index": 3,
+        "raw": "<00:01.29> is ",
+        "startMillisecond": 1290,
+        "content": " is "
       },
       {
-        "sylNumber": 1,
-        "raw": "<00:35.89>leaning ",
-        "startMillisecond": 35890,
-        "content": "leaning "
+        "index": 4,
+        "raw": "<00:01.63> found ",
+        "startMillisecond": 1630,
+        "content": " found "
       },
       {
-        "sylNumber": 2,
-        "raw": "<00:36.80>in ",
-        "startMillisecond": 36800,
-        "content": "in "
+        "index": 5,
+        "raw": "<00:03.09> to ",
+        "startMillisecond": 3090,
+        "content": " to "
       },
       {
-        "sylNumber": 3,
-        "raw": "<00:37.59>again",
-        "startMillisecond": 37590,
-        "content": "again"
+        "index": 6,
+        "raw": "<00:03.37> be ",
+        "startMillisecond": 3370,
+        "content": " be "
       },
       {
-        "sylNumber": 4,
-        "raw": "<00:38.46>",
-        "startMillisecond": 38460,
-        "content": ""
+        "index": 7,
+        "raw": "<00:05.92> lies ",
+        "startMillisecond": 5920,
+        "content": " lies "
       }
     ]
   }
 ]
 ```
 
-## Reference
-
-### parse(lrcString)
-
-parse lrc string to Line array.
-
-### toString(Line[])
-
-parse Line array back into valid lrc string.
-
-### expand(lrcString)
-
-returns new lrc string with all repeating lyrics inserted into separate lines.
-
 ### LineType
 
 types of line:
 
 - `LineType.INVALID` means it's invalid line
-- `LineType.LYRIC` means it's lyric line
 - `LineType.METADATA` means it's metadata line
-- `LineType.LYRIC_ENHANCED` means it's lyric with inline enhanced lrc tags. 
+- `LineType.LYRIC` means it's lyric line
+- `LineType.ENHANCED_LYRIC` means it's enhanced lyric line
+
+## Contributors
+
+<a href="https://github.com/mebtte/clrc/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=mebtte/clrc" />
+</a>
 
 ## License