@applemusic-like-lyrics/lyric 0.1.2 → 0.2.1

package/README.md

@@ -11,20 +11,21 @@
 
 本模块由于只着重于歌词内容，所以会丢弃一切和歌词无关的信息，如需获取一个歌词文件中的详细信息（例如歌手）请考虑使用其他框架。
 
-支持以下歌词格式的解析：
-- LyRiC 格式 `.lrc`
-- ESLyric 逐词歌词格式 `.lrc`
-- 网易云音乐逐词歌词格式 `.yrc`
-- QQ 音乐逐词歌词格式 `.qrc`
-- Lyricify Syllable 逐词歌词格式 `.lys`
-
-支持以下歌词格式的导出：
-- LyRiC 格式 `.lrc`
-- ESLyric 逐词歌词格式 `.lrc`
-- 网易云音乐逐词歌词格式 `.yrc`
-- QQ 音乐逐词歌词格式 `.qrc`
-- Lyricify Syllable 逐词歌词格式 `.lys`
-- ASS 字幕格式 `.ass`
+歌词格式支持表：
+
+| 源格式＼目标格式                      | 解析自身格式 | LyRiC 格式 `.lrc` | ESLyric 逐词歌词格式 `.lrc` | 网易云音乐逐词歌词格式 `.yrc` | QQ 音乐逐词歌词格式 `.qrc` | Lyricify Syllable 逐词歌词格式 `.lys` | TTML 歌词格式 `.ttml` | ASS 字幕格式 `.ass` |
+| ------------------------------------- | ------------ | ----------------- | --------------------------- | ----------------------------- | -------------------------- | ------------------------------------- | --------------------- | ------------------- |
+| LyRiC 格式 `.lrc`                     | ✅           | ／                | ✅                          | ✅                            | ✅                         | ✅                                    | ✅                    | ✅                  |
+| ESLyric 逐词歌词格式 `.lrc`           | ✅           | ✅                | ／                          | ✅                            | ✅                         | ✅                                    | ✅                    | ✅                  |
+| 网易云音乐逐词歌词格式 `.yrc`         | ✅           | ✅ [^1]           | ✅ [^1]                     | ／                            | ✅                         | ✅                                    | ✅                    | ✅                  |
+| QQ 音乐逐词歌词格式 `.qrc`            | ✅           | ✅ [^1]           | ✅ [^1]                     | ✅                            | ／                         | ✅                                    | ✅                    | ✅                  |
+| Lyricify Syllable 逐词歌词格式 `.lys` | ✅           | ✅ [^1]           | ✅ [^1]                     | ✅ [^2]                       | ✅ [^2]                    | ／                                    | ✅                    | ✅                  |
+| TTML 歌词格式 `.ttml`                 | ✅           | ✅ [^1]           | ✅ [^1]                     | ✅ [^2]                       | ✅ [^2]                    | ✅ [^3]                               | ／                    | ✅                  |
+| ASS 字幕格式 `.ass`                   | ❌           | ❌                | ❌                          | ❌                            | ❌                         | ❌                                    | ❌                    | ／                  |
+
+[^1]: 会丢失逐词时间数据、演唱属性（背景人声，对唱人声）和 AMLL 元数据
+[^2]: 会丢失演唱属性（背景人声，对唱人声）和 AMLL 元数据
+[^3]: 会丢失 AMLL 元数据
 
 ## 与 Core 歌词组件一起使用
 

package/package.json

@@ -4,7 +4,7 @@
     "SteveXMH <39523898+Steve-xmh@users.noreply.github.com>"
   ],
   "description": "一个歌词解析/生成模块，着重于歌词内容解析，支持多种格式",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "license": "GPL-3.0",
   "repository": {
     "type": "git",
@@ -20,10 +20,10 @@
     "pkg/*.js",
     "pkg/*.d.ts"
   ],
-  "module": "pkg/lyric.js",
-  "types": "pkg/lyric.d.ts",
+  "module": "pkg/amll_lyric.js",
+  "types": "pkg/amll_lyric.d.ts",
   "sideEffects": [
-    "./pkg/lyric.js",
+    "./pkg/amll_lyric.js",
     "./pkg/snippets/*"
   ]
 }

package/pkg/amll_lyric.d.ts

@@ -135,4 +135,18 @@ export interface LyricLine {
  */
 export function decryptQrcHex(hexData: string): string;
 
+/**
+ * 一个 TTML 歌词行对象，存储了歌词行信息和元数据信息
+ */
+export interface TTMLLyric {
+    /**
+     * TTML 中存储的歌词行信息
+     */
+    lines: LyricLine[];
+    /**
+     * 一个元数据表，以 `[键, 值数组]` 的形式存储
+     */
+    metadata: [string, string[]][];
+}
+
 

package/pkg/amll_lyric_bg.js

@@ -104,6 +104,7 @@ function passStringToWasm0(arg, malloc, realloc) {
         const ret = encodeString(arg, view);
 
         offset += ret.written;
+        ptr = realloc(ptr, len, offset, 1) >>> 0;
     }
 
     WASM_VECTOR_LEN = offset;
@@ -377,6 +378,38 @@ export function stringifyQrc(lrc) {
     }
 }
 
+/**
+* @param {string} src
+* @returns {any}
+*/
+export function parseTTML(src) {
+    const ptr0 = passStringToWasm0(src, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.parseTTML(ptr0, len0);
+    return takeObject(ret);
+}
+
+/**
+* @param {any} lrc
+* @returns {string}
+*/
+export function stringifyTTML(lrc) {
+    let deferred1_0;
+    let deferred1_1;
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        wasm.stringifyTTML(retptr, addHeapObject(lrc));
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        deferred1_0 = r0;
+        deferred1_1 = r1;
+        return getStringFromWasm0(r0, r1);
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+        wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+    }
+}
+
 /**
 * @param {string} src
 * @returns {any}
@@ -516,26 +549,26 @@ export function __wbindgen_string_new(arg0, arg1) {
     return addHeapObject(ret);
 };
 
-export function __wbg_getwithrefkey_4a92a5eca60879b9(arg0, arg1) {
+export function __wbg_getwithrefkey_da95c5f2892b1e93(arg0, arg1) {
     const ret = getObject(arg0)[getObject(arg1)];
     return addHeapObject(ret);
 };
 
-export function __wbg_set_9182712abebf82ef(arg0, arg1, arg2) {
+export function __wbg_set_2e973e6a06d4c5c3(arg0, arg1, arg2) {
     getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
 };
 
-export function __wbg_get_44be0491f933a435(arg0, arg1) {
+export function __wbg_get_0ee8ea3c7c984c45(arg0, arg1) {
     const ret = getObject(arg0)[arg1 >>> 0];
     return addHeapObject(ret);
 };
 
-export function __wbg_length_fff51ee6522a1a18(arg0) {
+export function __wbg_length_161c0d89c6535c1d(arg0) {
     const ret = getObject(arg0).length;
     return ret;
 };
 
-export function __wbg_new_898a68150f225f2e() {
+export function __wbg_new_75208e29bddfd88c() {
     const ret = new Array();
     return addHeapObject(ret);
 };
@@ -545,95 +578,95 @@ export function __wbindgen_is_function(arg0) {
     return ret;
 };
 
-export function __wbg_next_526fc47e980da008(arg0) {
+export function __wbg_next_586204376d2ed373(arg0) {
     const ret = getObject(arg0).next;
     return addHeapObject(ret);
 };
 
-export function __wbg_next_ddb3312ca1c4e32a() { return handleError(function (arg0) {
+export function __wbg_next_b2d3366343a208b3() { return handleError(function (arg0) {
     const ret = getObject(arg0).next();
     return addHeapObject(ret);
 }, arguments) };
 
-export function __wbg_done_5c1f01fb660d73b5(arg0) {
+export function __wbg_done_90b14d6f6eacc42f(arg0) {
     const ret = getObject(arg0).done;
     return ret;
 };
 
-export function __wbg_value_1695675138684bd5(arg0) {
+export function __wbg_value_3158be908c80a75e(arg0) {
     const ret = getObject(arg0).value;
     return addHeapObject(ret);
 };
 
-export function __wbg_iterator_97f0c81209c6c35a() {
+export function __wbg_iterator_40027cdd598da26b() {
     const ret = Symbol.iterator;
     return addHeapObject(ret);
 };
 
-export function __wbg_get_97b561fb56f034b5() { return handleError(function (arg0, arg1) {
+export function __wbg_get_3fddfed2c83f434c() { return handleError(function (arg0, arg1) {
     const ret = Reflect.get(getObject(arg0), getObject(arg1));
     return addHeapObject(ret);
 }, arguments) };
 
-export function __wbg_call_cb65541d95d71282() { return handleError(function (arg0, arg1) {
+export function __wbg_call_3f093dd26d5569f8() { return handleError(function (arg0, arg1) {
     const ret = getObject(arg0).call(getObject(arg1));
     return addHeapObject(ret);
 }, arguments) };
 
-export function __wbg_new_b51585de1b234aff() {
+export function __wbg_new_632630b5cec17f21() {
     const ret = new Object();
     return addHeapObject(ret);
 };
 
-export function __wbg_set_502d29070ea18557(arg0, arg1, arg2) {
+export function __wbg_set_79c308ecd9a1d091(arg0, arg1, arg2) {
     getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
 };
 
-export function __wbg_isArray_4c24b343cb13cfb1(arg0) {
+export function __wbg_isArray_e783c41d0dd19b44(arg0) {
     const ret = Array.isArray(getObject(arg0));
     return ret;
 };
 
-export function __wbg_instanceof_ArrayBuffer_39ac22089b74fddb(arg0) {
+export function __wbg_instanceof_ArrayBuffer_9221fa854ffb71b5(arg0) {
     let result;
     try {
         result = getObject(arg0) instanceof ArrayBuffer;
-    } catch {
+    } catch (_) {
         result = false;
     }
     const ret = result;
     return ret;
 };
 
-export function __wbg_isSafeInteger_bb8e18dd21c97288(arg0) {
+export function __wbg_isSafeInteger_a23a66ee7c41b273(arg0) {
     const ret = Number.isSafeInteger(getObject(arg0));
     return ret;
 };
 
-export function __wbg_buffer_085ec1f694018c4f(arg0) {
+export function __wbg_buffer_b914fb8b50ebbc3e(arg0) {
     const ret = getObject(arg0).buffer;
     return addHeapObject(ret);
 };
 
-export function __wbg_new_8125e318e6245eed(arg0) {
+export function __wbg_new_b1f2d6842d615181(arg0) {
     const ret = new Uint8Array(getObject(arg0));
     return addHeapObject(ret);
 };
 
-export function __wbg_set_5cf90238115182c3(arg0, arg1, arg2) {
+export function __wbg_set_7d988c98e6ced92d(arg0, arg1, arg2) {
     getObject(arg0).set(getObject(arg1), arg2 >>> 0);
 };
 
-export function __wbg_length_72e2208bbc0efc61(arg0) {
+export function __wbg_length_21c4b0ae73cba59d(arg0) {
     const ret = getObject(arg0).length;
     return ret;
 };
 
-export function __wbg_instanceof_Uint8Array_d8d9cb2b8e8ac1d4(arg0) {
+export function __wbg_instanceof_Uint8Array_c299a4ee232e76ba(arg0) {
     let result;
     try {
         result = getObject(arg0) instanceof Uint8Array;
-    } catch {
+    } catch (_) {
         result = false;
     }
     const ret = result;

package/pkg/amll_lyric_bg.wasm.d.ts

@@ -11,6 +11,8 @@ export function parseLys(a: number, b: number): number;
 export function stringifyLys(a: number, b: number): void;
 export function parseQrc(a: number, b: number): number;
 export function stringifyQrc(a: number, b: number): void;
+export function parseTTML(a: number, b: number): number;
+export function stringifyTTML(a: number, b: number): void;
 export function parseYrc(a: number, b: number): number;
 export function stringifyYrc(a: number, b: number): void;
 export function wasm_start(): void;