@dan-uni/dan-any 1.4.0 → 1.4.2

package/dist/browser/index.min.js

@@ -11480,7 +11480,7 @@ __webpack_require__.d(platform_namespaceObject, {
     PlatformVideoSource: ()=>platform_PlatformVideoSource,
     PlatformVideoSources: ()=>PlatformVideoSources
 });
-var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.0","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
 const decimalToHex = (n)=>color_pad(n.toString(16));
 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -12028,7 +12028,7 @@ class UniDM {
             mode: 4,
             senderID: senderID.toString(),
             ctime: new Date(`${args.ctime} GMT+0800`),
-            weight: 10,
+            weight: 11,
             pool: 2,
             attr: [
                 "Protect"
@@ -12851,6 +12851,15 @@ var src_DM_format = /*#__PURE__*/ function(DM_format) {
     DM_format["CommonAss"] = "common.ass";
     return DM_format;
 }({});
+const Conver2Formats = [
+    "danuni.json",
+    "danuni.min.json",
+    "danuni.binpb",
+    "bili.xml",
+    "dplayer.json",
+    "artplayer.json",
+    "ddplay.json"
+];
 class UniPool {
     constructor(dans, options = {}, info = {
         fromConverted: false
@@ -13504,4 +13513,4 @@ class UniPool {
         }, canvasCtx);
     }
 }
-export { UniDM, UniPool, bili_history_fast_forward, bili_namespaceObject as bili, dedupe_namespaceObject as bili_dedupe, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_namespaceObject as platform, plugins_namespaceObject as plugins, src_DM_format as DM_format };
+export { Conver2Formats, UniDM, UniPool, bili_history_fast_forward, bili_namespaceObject as bili, dedupe_namespaceObject as bili_dedupe, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_namespaceObject as platform, plugins_namespaceObject as plugins, src_DM_format as DM_format };

package/dist/browser/src/index.d.ts

@@ -141,7 +141,8 @@ export interface Options {
      */
     dmid?: boolean | number | UniIDTools.DMIDGenerator;
 }
-type Convert2Format = DM_format.DanuniJson | DM_format.DanuniMinJson | DM_format.DanuniPbBin | DM_format.BiliXml | DM_format.DplayerJson | DM_format.ArtplayerJson | DM_format.DDPlayJson;
+export declare const Conver2Formats: DM_format[];
+export type Convert2Formats = DM_format.DanuniJson | DM_format.DanuniMinJson | DM_format.DanuniPbBin | DM_format.BiliXml | DM_format.DplayerJson | DM_format.ArtplayerJson | DM_format.DDPlayJson;
 type Convert2ResultMap = {
     [DM_format.DanuniJson]: UniDM[];
     [DM_format.DanuniMinJson]: DM_JSON_DanuniMin;
@@ -222,8 +223,8 @@ export declare class UniPool {
         pool: UniPool;
         fmt: DM_format;
     };
-    convert2(format: DM_format, file_wrapper: true, continue_on_error?: boolean): File;
-    convert2<T extends Convert2Format>(format: T, file_wrapper?: false, continue_on_error?: boolean): Convert2ResultMap[T];
+    convert2<T extends Exclude<DM_format, Convert2Formats>>(format: T, file_wrapper: true, continue_on_error?: boolean): File;
+    convert2<T extends Convert2Formats>(format: T, file_wrapper?: false, continue_on_error?: boolean): Convert2ResultMap[T];
     minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
     static fromMin(json: DM_JSON_DanuniMin, options?: Options): UniPool;
     static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options): UniPool;

package/dist/node/index.js

@@ -59,7 +59,7 @@ __webpack_require__.d(platform_namespaceObject, {
     PlatformVideoSource: ()=>platform_PlatformVideoSource,
     PlatformVideoSources: ()=>PlatformVideoSources
 });
-var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.0","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
 const decimalToHex = (n)=>color_pad(n.toString(16));
 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -606,7 +606,7 @@ class UniDM {
             mode: 4,
             senderID: senderID.toString(),
             ctime: new Date(`${args.ctime} GMT+0800`),
-            weight: 10,
+            weight: 11,
             pool: 2,
             attr: [
                 "Protect"
@@ -1427,6 +1427,15 @@ var src_DM_format = /*#__PURE__*/ function(DM_format) {
     DM_format["CommonAss"] = "common.ass";
     return DM_format;
 }({});
+const Conver2Formats = [
+    "danuni.json",
+    "danuni.min.json",
+    "danuni.binpb",
+    "bili.xml",
+    "dplayer.json",
+    "artplayer.json",
+    "ddplay.json"
+];
 class UniPool {
     constructor(dans, options = {}, info = {
         fromConverted: false
@@ -2080,4 +2089,4 @@ class UniPool {
         }, canvasCtx);
     }
 }
-export { UniDM, UniPool, bili_history_fast_forward, bili_namespaceObject as bili, dedupe_namespaceObject as bili_dedupe, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_namespaceObject as platform, plugins_namespaceObject as plugins, src_DM_format as DM_format };
+export { Conver2Formats, UniDM, UniPool, bili_history_fast_forward, bili_namespaceObject as bili, dedupe_namespaceObject as bili_dedupe, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, platform_namespaceObject as platform, plugins_namespaceObject as plugins, src_DM_format as DM_format };

package/dist/node/src/index.d.ts

@@ -141,7 +141,8 @@ export interface Options {
      */
     dmid?: boolean | number | UniIDTools.DMIDGenerator;
 }
-type Convert2Format = DM_format.DanuniJson | DM_format.DanuniMinJson | DM_format.DanuniPbBin | DM_format.BiliXml | DM_format.DplayerJson | DM_format.ArtplayerJson | DM_format.DDPlayJson;
+export declare const Conver2Formats: DM_format[];
+export type Convert2Formats = DM_format.DanuniJson | DM_format.DanuniMinJson | DM_format.DanuniPbBin | DM_format.BiliXml | DM_format.DplayerJson | DM_format.ArtplayerJson | DM_format.DDPlayJson;
 type Convert2ResultMap = {
     [DM_format.DanuniJson]: UniDM[];
     [DM_format.DanuniMinJson]: DM_JSON_DanuniMin;
@@ -222,8 +223,8 @@ export declare class UniPool {
         pool: UniPool;
         fmt: DM_format;
     };
-    convert2(format: DM_format, file_wrapper: true, continue_on_error?: boolean): File;
-    convert2<T extends Convert2Format>(format: T, file_wrapper?: false, continue_on_error?: boolean): Convert2ResultMap[T];
+    convert2<T extends Exclude<DM_format, Convert2Formats>>(format: T, file_wrapper: true, continue_on_error?: boolean): File;
+    convert2<T extends Convert2Formats>(format: T, file_wrapper?: false, continue_on_error?: boolean): Convert2ResultMap[T];
     minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
     static fromMin(json: DM_JSON_DanuniMin, options?: Options): UniPool;
     static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options): UniPool;

package/dist/umd/index.umd.min.js

@@ -13573,12 +13573,13 @@
                 "use strict";
                 __webpack_require__.r(__webpack_exports__);
                 __webpack_require__.d(__webpack_exports__, {
-                    plugins: ()=>plugins,
-                    platform: ()=>platform,
                     UniDM: ()=>UniDM,
-                    UniDMTools: ()=>dm_gen_namespaceObject,
                     UniPool: ()=>UniPool,
                     DM_format: ()=>src_DM_format,
+                    plugins: ()=>plugins,
+                    Conver2Formats: ()=>Conver2Formats,
+                    platform: ()=>platform,
+                    UniDMTools: ()=>dm_gen_namespaceObject,
                     UniIDTools: ()=>id_gen_namespaceObject
                 });
                 var id_gen_namespaceObject = {};
@@ -21209,7 +21210,7 @@
                 function timestamp_timestampMs(timestamp) {
                     return 1000 * Number(timestamp.seconds) + Math.round(timestamp.nanos / 1000000);
                 }
-                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.0","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
                 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
                 const decimalToHex = (n)=>color_pad(n.toString(16));
                 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -23935,7 +23936,7 @@
                             mode: 4,
                             senderID: senderID.toString(),
                             ctime: new Date(`${args.ctime} GMT+0800`),
-                            weight: 10,
+                            weight: 11,
                             pool: 2,
                             attr: [
                                 "Protect"
@@ -24699,6 +24700,15 @@
                     DM_format["CommonAss"] = "common.ass";
                     return DM_format;
                 }({});
+                const Conver2Formats = [
+                    "danuni.json",
+                    "danuni.min.json",
+                    "danuni.binpb",
+                    "bili.xml",
+                    "dplayer.json",
+                    "artplayer.json",
+                    "ddplay.json"
+                ];
                 class UniPool {
                     constructor(dans, options = {}, info = {
                         fromConverted: false

package/dist/umd/plugins/bili.umd.min.js

@@ -21186,7 +21186,7 @@
                 function timestamp_timestampMs(timestamp) {
                     return 1000 * Number(timestamp.seconds) + Math.round(timestamp.nanos / 1000000);
                 }
-                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.0","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
                 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
                 const decimalToHex = (n)=>color_pad(n.toString(16));
                 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -23892,7 +23892,7 @@
                             mode: 4,
                             senderID: senderID.toString(),
                             ctime: new Date(`${args.ctime} GMT+0800`),
-                            weight: 10,
+                            weight: 11,
                             pool: 2,
                             attr: [
                                 "Protect"

package/dist/umd/plugins/index.umd.min.js

@@ -21186,7 +21186,7 @@
                 function timestamp_timestampMs(timestamp) {
                     return 1000 * Number(timestamp.seconds) + Math.round(timestamp.nanos / 1000000);
                 }
-                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.0","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
+                var package_namespaceObject = JSON.parse('{"UU":"@dan-uni/dan-any","rE":"1.4.2","TB":"https://github.com/ani-uni/danuni/tree/master/packages/dan-any#readme"}');
                 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
                 const decimalToHex = (n)=>color_pad(n.toString(16));
                 const isDarkColor = ({ r, g, b })=>0.299 * r + 0.587 * g + 0.114 * b < 0x30;
@@ -23892,7 +23892,7 @@
                             mode: 4,
                             senderID: senderID.toString(),
                             ctime: new Date(`${args.ctime} GMT+0800`),
-                            weight: 10,
+                            weight: 11,
                             pool: 2,
                             attr: [
                                 "Protect"

package/dist/umd/src/index.d.ts

@@ -141,7 +141,8 @@ export interface Options {
      */
     dmid?: boolean | number | UniIDTools.DMIDGenerator;
 }
-type Convert2Format = DM_format.DanuniJson | DM_format.DanuniMinJson | DM_format.DanuniPbBin | DM_format.BiliXml | DM_format.DplayerJson | DM_format.ArtplayerJson | DM_format.DDPlayJson;
+export declare const Conver2Formats: DM_format[];
+export type Convert2Formats = DM_format.DanuniJson | DM_format.DanuniMinJson | DM_format.DanuniPbBin | DM_format.BiliXml | DM_format.DplayerJson | DM_format.ArtplayerJson | DM_format.DDPlayJson;
 type Convert2ResultMap = {
     [DM_format.DanuniJson]: UniDM[];
     [DM_format.DanuniMinJson]: DM_JSON_DanuniMin;
@@ -222,8 +223,8 @@ export declare class UniPool {
         pool: UniPool;
         fmt: DM_format;
     };
-    convert2(format: DM_format, file_wrapper: true, continue_on_error?: boolean): File;
-    convert2<T extends Convert2Format>(format: T, file_wrapper?: false, continue_on_error?: boolean): Convert2ResultMap[T];
+    convert2<T extends Exclude<DM_format, Convert2Formats>>(format: T, file_wrapper: true, continue_on_error?: boolean): File;
+    convert2<T extends Convert2Formats>(format: T, file_wrapper?: false, continue_on_error?: boolean): Convert2ResultMap[T];
     minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
     static fromMin(json: DM_JSON_DanuniMin, options?: Options): UniPool;
     static fromPb(bin: Uint8Array | ArrayBuffer, options?: Options): UniPool;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dan-uni/dan-any",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "author": "rinne",
   "license": "LGPL-3.0-or-later",

package/src/index.ts

@@ -200,7 +200,16 @@ export interface Options {
   dmid?: boolean | number | UniIDTools.DMIDGenerator
 }
 
-type Convert2Format =
+export const Conver2Formats = [
+  DM_format.DanuniJson,
+  DM_format.DanuniMinJson,
+  DM_format.DanuniPbBin,
+  DM_format.BiliXml,
+  DM_format.DplayerJson,
+  DM_format.ArtplayerJson,
+  DM_format.DDPlayJson,
+]
+export type Convert2Formats =
   | DM_format.DanuniJson
   | DM_format.DanuniMinJson
   | DM_format.DanuniPbBin
@@ -684,12 +693,12 @@ export class UniPool {
     }
     throw new Error(errmesg ?? err)
   }
-  convert2(
-    format: DM_format,
+  convert2<T extends Exclude<DM_format, Convert2Formats>>(
+    format: T,
     file_wrapper: true,
     continue_on_error?: boolean,
   ): File
-  convert2<T extends Convert2Format>(
+  convert2<T extends Convert2Formats>(
     format: T,
     file_wrapper?: false,
     continue_on_error?: boolean,
@@ -698,7 +707,7 @@ export class UniPool {
     format: DM_format,
     file_wrapper = false,
     continue_on_error = false,
-  ): File | Convert2ResultMap[Convert2Format] | string {
+  ): File | Convert2ResultMap[Convert2Formats] | string {
     switch (format) {
       case DM_format.DanuniJson:
         if (file_wrapper)

package/src/utils/dm-gen.ts

@@ -932,7 +932,7 @@ export class UniDM {
         senderID: senderID.toString(),
         // content: args.content,
         ctime: new Date(`${args.ctime} GMT+0800`), // 无视本地时区，按照B站的东8区计算时间
-        weight: 10,
+        weight: 11,
         pool: Pools.Adv,
         attr: [DMAttr.Protect],
         platform: PlatformVideoSource.Bilibili,