support esm

Author: weirongxu

.prettierrc.json

@@ -1,5 +1,6 @@
 {
   "semi": true,
   "singleQuote": true,
-  "trailingComma": "all"
+  "trailingComma": "all",
+  "arrowParens": "always"
 }

package.json

@@ -2,9 +2,12 @@
   "name": "lrc-kit",
   "version": "1.0.0",
   "description": "lrc parser, maker, runner",
-  "main": "lib/lrc-kit.js",
+  "main": "lib/cjs/lrc-kit.js",
+  "module": "lib/esm/lrc-kit.js",
   "scripts": {
-    "build": "tsc",
+    "build": "yarn run build:esm && yarn run build:cjs",
+    "build:esm": "tsc --module es2015 --target es5 --outDir lib/esm",
+    "build:cjs": "tsc --module commonjs --target es5 --outDir lib/cjs",
     "clean": "rm -rf lib",
     "test": "jest",
     "prepare": "yarn clean && yarn build"

src/line-parser.ts

@@ -8,7 +8,7 @@ export const TIME_REGEXP = /^\s*(\d+)\s*:\s*(\d+(\s*[\.:]\s*\d+)?)\s*$/;
 export enum LineType {
   INVALID = 'INVALID',
   INFO = 'INFO',
-  TIME = 'TIME'
+  TIME = 'TIME',
 }
 
 export interface InvalidLine {
@@ -40,18 +40,18 @@ export function parseTags(line: string): null | [string[], string] {
 
 export function parseTime(tags: string[], content: string): TimeLine {
   const timestamps: number[] = [];
-  tags.forEach(tag => {
+  tags.forEach((tag) => {
     const matches = TIME_REGEXP.exec(tag)!;
     const minutes = parseFloat(matches[1]);
     const seconds = parseFloat(
-      matches[2].replace(/\s+/g, '').replace(':', '.')
+      matches[2].replace(/\s+/g, '').replace(':', '.'),
     );
     timestamps.push(minutes * 60 + seconds);
   });
   return {
     type: LineType.TIME,
     timestamps,
-    content: content.trim()
+    content: content.trim(),
   };
 }
 
@@ -60,7 +60,7 @@ export function parseInfo(tag: string): InfoLine {
   return {
     type: LineType.INFO,
     key: matches[1].trim(),
-    value: matches[2].trim()
+    value: matches[2].trim(),
   };
 }
 
@@ -89,11 +89,11 @@ export function parseLine(line: string): InfoLine | TimeLine | InvalidLine {
       }
     }
     return {
-      type: LineType.INVALID
+      type: LineType.INVALID,
     };
   } catch (_e) {
     return {
-      type: LineType.INVALID
+      type: LineType.INVALID,
     };
   }
 }

src/lrc-kit.ts

@@ -1,2 +1,2 @@
-export * from './lrc'
-export * from './runner'
+export * from './lrc';
+export * from './runner';

src/lrc.ts

@@ -26,7 +26,7 @@ export function padZero(num: number | string, size: number = 2): string {
  */
 export function timestampToString(timestamp: number): string {
   return `${padZero(Math.floor(timestamp / 60))}:${padZero(
-    (timestamp % 60).toFixed(2)
+    (timestamp % 60).toFixed(2),
   )}`;
 }
 
@@ -50,19 +50,19 @@ export class Lrc {
     const info: Info = {};
     text
       .split(/\r\n|[\n\r]/g)
-      .map(line => {
+      .map((line) => {
         return parseLine(line);
       })
-      .forEach(line => {
+      .forEach((line) => {
         switch (line.type) {
           case LineType.INFO:
             info[line.key] = line.value;
             break;
           case LineType.TIME:
-            line.timestamps.forEach(timestamp => {
+            line.timestamps.forEach((timestamp) => {
               lyrics.push({
                 timestamp: timestamp,
-                content: line.content
+                content: line.content,
               });
             });
             break;
@@ -77,7 +77,7 @@ export class Lrc {
   }
 
   offset(offsetTime: number) {
-    this.lyrics.forEach(lyric => {
+    this.lyrics.forEach((lyric) => {
       lyric.timestamp += offsetTime;
       if (lyric.timestamp < 0) {
         lyric.timestamp = 0;
@@ -100,7 +100,7 @@ export class Lrc {
         ret.push(clonePlainObject(lyric));
         return ret;
       },
-      [] as Lyric[]
+      [] as Lyric[],
     );
     return lrc;
   }
@@ -127,7 +127,7 @@ export class Lrc {
 
     if (opts.combine) {
       // uniqueness
-      this.lyrics.forEach(lyric => {
+      this.lyrics.forEach((lyric) => {
         if (lyric.content in lyricsMap) {
           lyricsMap[lyric.content].push(lyric.timestamp);
         } else {
@@ -142,7 +142,7 @@ export class Lrc {
         }
         lyricsList.push({
           timestamps: lyricsMap[content],
-          content: content
+          content: content,
         });
       }
 
@@ -151,17 +151,17 @@ export class Lrc {
       }
 
       // generate lyrics
-      lyricsList.forEach(lyric => {
+      lyricsList.forEach((lyric) => {
         lines.push(
           `[${lyric.timestamps
-            .map(timestamp => timestampToString(timestamp))
-            .join('][')}]${lyric.content || ''}`
+            .map((timestamp) => timestampToString(timestamp))
+            .join('][')}]${lyric.content || ''}`,
         );
       });
     } else {
-      this.lyrics.forEach(lyric => {
+      this.lyrics.forEach((lyric) => {
         lines.push(
-          `[${timestampToString(lyric.timestamp)}]${lyric.content || ''}`
+          `[${timestampToString(lyric.timestamp)}]${lyric.content || ''}`,
         );
       });
     }

src/runner.ts

@@ -1,94 +1,98 @@
-import { Lrc } from './lrc'
+import { Lrc } from './lrc';
 
 export class Runner {
   offset: boolean;
   _currentIndex: number;
-  lrc: Lrc;
+  lrc!: Lrc;
 
   constructor(lrc: Lrc = new Lrc(), offset: boolean = true) {
-    this.offset = offset
-    this._currentIndex = -1
-    this.setLrc(lrc)
+    this.offset = offset;
+    this._currentIndex = -1;
+    this.setLrc(lrc);
   }
 
   setLrc(lrc: Lrc) {
-    this.lrc = lrc.clone()
-    this.lrcUpdate()
+    this.lrc = lrc.clone();
+    this.lrcUpdate();
   }
 
   lrcUpdate() {
     if (this.offset) {
-      this._offsetAlign()
+      this._offsetAlign();
     }
-    this._sort()
+    this._sort();
   }
 
   _offsetAlign() {
     if ('offset' in this.lrc.info) {
-      const offset = parseInt(this.lrc.info.offset) / 1000
-      if (! isNaN(offset)) {
-        this.lrc.offset(offset)
-        delete this.lrc.info.offset
+      const offset = parseInt(this.lrc.info.offset) / 1000;
+      if (!isNaN(offset)) {
+        this.lrc.offset(offset);
+        delete this.lrc.info.offset;
       }
     }
   }
 
   _sort() {
-    this.lrc.lyrics.sort((a, b) => a.timestamp - b.timestamp)
+    this.lrc.lyrics.sort((a, b) => a.timestamp - b.timestamp);
   }
 
   timeUpdate(timestamp: number) {
     if (this._currentIndex >= this.lrc.lyrics.length) {
-      this._currentIndex = this.lrc.lyrics.length - 1
+      this._currentIndex = this.lrc.lyrics.length - 1;
     } else if (this._currentIndex < -1) {
-      this._currentIndex = -1
+      this._currentIndex = -1;
     }
-    this._currentIndex = this._findIndex(timestamp, this._currentIndex)
+    this._currentIndex = this._findIndex(timestamp, this._currentIndex);
   }
 
-  _findIndex(timestamp: number, startIndex: number) {
-    const curFrontTimestamp = startIndex == -1 ?
-      Number.NEGATIVE_INFINITY : this.lrc.lyrics[startIndex].timestamp
+  _findIndex(timestamp: number, startIndex: number): number {
+    const curFrontTimestamp =
+      startIndex == -1
+        ? Number.NEGATIVE_INFINITY
+        : this.lrc.lyrics[startIndex].timestamp;
 
-    const curBackTimestamp = (startIndex == this.lrc.lyrics.length - 1) ?
-      Number.POSITIVE_INFINITY : this.lrc.lyrics[startIndex+1].timestamp
+    const curBackTimestamp =
+      startIndex == this.lrc.lyrics.length - 1
+        ? Number.POSITIVE_INFINITY
+        : this.lrc.lyrics[startIndex + 1].timestamp;
 
     if (timestamp < curFrontTimestamp) {
-      return this._findIndex(timestamp, startIndex-1)
+      return this._findIndex(timestamp, startIndex - 1);
     } else if (timestamp === curBackTimestamp) {
       if (curBackTimestamp === Number.POSITIVE_INFINITY) {
-        return startIndex
+        return startIndex;
       } else {
-        return startIndex+1
+        return startIndex + 1;
       }
     } else if (timestamp > curBackTimestamp) {
-      return this._findIndex(timestamp, startIndex+1)
+      return this._findIndex(timestamp, startIndex + 1);
     } else {
-      return startIndex
+      return startIndex;
     }
   }
 
   getInfo() {
-    return this.lrc.info
+    return this.lrc.info;
   }
 
   getLyrics() {
-    return this.lrc.lyrics
+    return this.lrc.lyrics;
   }
 
   getLyric(index: number = this.curIndex()) {
     if (index >= 0 && index <= this.lrc.lyrics.length - 1) {
-      return this.lrc.lyrics[index]
+      return this.lrc.lyrics[index];
     } else {
-      throw new Error('Index not exist')
+      throw new Error('Index not exist');
     }
   }
 
   curIndex() {
-    return this._currentIndex
+    return this._currentIndex;
   }
 
   curLyric() {
-    return this.getLyric()
+    return this.getLyric();
   }
 }