@dan-uni/dan-any 0.9.3 → 0.9.5

package/dist/src/ass-gen/ass/create.d.ts

@@ -1,5 +1,4 @@
 import type { UniPool } from '../..';
 import type { Context, SubtitleStyle } from '../types';
 import type { RawConfig } from './raw';
-declare const _default: (list: UniPool, rawList: UniPool, config: SubtitleStyle, context?: Context, rawConfig?: RawConfig) => string;
-export default _default;
+export declare const ass: (list: UniPool, rawList: UniPool, config: SubtitleStyle, context?: Context, rawConfig?: RawConfig) => string;

package/dist/src/ass-gen/ass/dialogue.d.ts

@@ -1,6 +1,6 @@
 import type { RGB } from '../types';
 import { DanmakuType } from '../types';
-declare const _default: (danmaku: {
+export declare const dialogue: (danmaku: {
     type: (typeof DanmakuType)[keyof typeof DanmakuType];
     color: RGB;
     fontSizeType: number;
@@ -14,4 +14,3 @@ declare const _default: (danmaku: {
     scrollTime: number;
     fixTime: number;
 }) => string;
-export default _default;

package/dist/src/ass-gen/ass/event.d.ts

@@ -1,3 +1,2 @@
 import type { Danmaku, SubtitleStyle } from '../types';
-declare const _default: (list: Danmaku[], config: SubtitleStyle) => string;
-export default _default;
+export declare const event: (list: Danmaku[], config: SubtitleStyle) => string;

package/dist/src/ass-gen/ass/info.d.ts

@@ -4,5 +4,5 @@ type Resolution = {
     playResX: number;
     playResY: number;
 };
-declare const _default: ({ playResX, playResY }: Resolution, { filename, title }: ExtraInfo) => string;
-export default _default;
+export declare const info: ({ playResX, playResY }: Resolution, { filename, title }: ExtraInfo) => string;
+export {};

package/dist/src/ass-gen/ass/style.d.ts

@@ -1,3 +1,2 @@
 import type { SubtitleStyle } from '../types';
-declare const _default: ({ fontName, fontSize, color: configColor, outlineColor, backColor, bold, outline, shadow, opacity, }: SubtitleStyle) => string;
-export default _default;
+export declare const style: ({ fontName, fontSize, color: configColor, outlineColor, backColor, bold, outline, shadow, opacity, }: SubtitleStyle) => string;

package/dist/src/ass-gen/config.d.ts

@@ -1,3 +1,2 @@
 import type { SubtitleStyle } from './types';
-declare const _default: (overrides?: {}) => SubtitleStyle;
-export default _default;
+export declare const getConfig: (overrides?: {}) => SubtitleStyle;

package/dist/src/index.d.ts

@@ -113,7 +113,11 @@ export declare class UniPool {
      */
     merge(lifetime?: number): UniPool;
     minify(): (Partial<UniDMTools.UniDMObj> & Pick<UniDMTools.UniDMObj, "SOID">)[];
-    static import(file: unknown, options?: Options): {
+    static import(file: unknown, options?: Options, 
+    /**
+     * 加载指定解析模块，为空则全选
+     */
+    mod?: ('json' | 'str' | 'bin')[]): {
         pool: UniPool;
         fmt: DM_format;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "type": "module",
   "keywords": [
@@ -32,20 +32,20 @@
     "buf": "buf generate"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.7.0",
+    "@bufbuild/protobuf": "^2.9.0",
     "base16384": "^1.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
-    "fast-xml-parser": "^5.2.5",
-    "fs-extra": "^11.3.1",
+    "fast-xml-parser": "^5.3.0",
+    "fs-extra": "^11.3.2",
     "hh-mm-ss": "^1.2.0",
     "json-bigint": "^1.0.0",
     "jssha": "^3.3.1",
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.56.0",
-    "@bufbuild/protoc-gen-es": "^2.7.0",
+    "@bufbuild/buf": "^1.57.2",
+    "@bufbuild/protoc-gen-es": "^2.9.0",
     "@types/fs-extra": "^11.0.4",
     "@types/hh-mm-ss": "^1.2.3",
     "@types/json-bigint": "^1.0.4",

package/src/ass-gen/__tests__/generate.test.ts

@@ -12,7 +12,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 it('generate ass from xml', () => {
   const filename = '898651903.xml'
   const xmlPath = path.join(__dirname, filename)
-  const xmlText = fs.readFileSync(xmlPath, 'utf-8')
+  const xmlText = fs.readFileSync(xmlPath, 'utf8')
   const canvas = createCanvas(50, 50)
   const assText = generateASS(
     UniPool.fromBiliXML(xmlText),
@@ -22,5 +22,5 @@ it('generate ass from xml', () => {
     },
     canvas.getContext('2d') as unknown as CanvasRenderingContext2D,
   )
-  fs.writeFileSync(path.join(__dirname, `${filename}.ass`), assText, 'utf-8')
+  fs.writeFileSync(path.join(__dirname, `${filename}.ass`), assText, 'utf8')
 })

package/src/ass-gen/ass/create.ts

@@ -3,17 +3,18 @@ import type { Context, SubtitleStyle } from '../types'
 import type { RawConfig } from './raw'
 
 import { UniPool2DanmakuLists } from '../util'
-import event from './event'
-import info from './info'
+import { event } from './event'
+import { info } from './info'
 import { raw } from './raw'
-import style from './style'
+import { style } from './style'
 
-// eslint-disable-next-line import/no-default-export
-export default (
+const default_context = { filename: 'unknown', title: 'unknown' }
+
+export const ass = (
   list: UniPool,
   rawList: UniPool,
   config: SubtitleStyle,
-  context: Context = { filename: 'unknown', title: 'unknown' },
+  context: Context = default_context,
   rawConfig?: RawConfig,
 ) => {
   const Elist = UniPool2DanmakuLists(list)

package/src/ass-gen/ass/dialogue.ts

@@ -40,8 +40,7 @@ const fixCommand = ({ top, left }: { top: number; left: number }) =>
 const colorCommand = (color: RGB) => `\\c${formatColor(color)}`
 const borderColorCommand = (color: RGB) => `\\3c${formatColor(color)}`
 
-// eslint-disable-next-line import/no-default-export
-export default (
+export const dialogue = (
   danmaku: {
     type: (typeof DanmakuType)[keyof typeof DanmakuType]
     color: RGB

package/src/ass-gen/ass/event.ts

@@ -1,7 +1,7 @@
 import type { Danmaku, SubtitleStyle } from '../types'
 
 import { DanmakuType } from '../types'
-import dialogue from './dialogue'
+import { dialogue } from './dialogue'
 
 const calculateDanmakuPosition = (danmaku: Danmaku, config: SubtitleStyle) => {
   const { playResX, playResY, scrollTime, fixTime } = config
@@ -43,8 +43,7 @@ const calculateDanmakuPosition = (danmaku: Danmaku, config: SubtitleStyle) => {
   }
 }
 
-// eslint-disable-next-line import/no-default-export
-export default (list: Danmaku[], config: SubtitleStyle) => {
+export const event = (list: Danmaku[], config: SubtitleStyle) => {
   const content = [
     '[Events]',
     'Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text',

package/src/ass-gen/ass/info.ts

@@ -9,8 +9,7 @@ type Resolution = {
   playResY: number
 }
 
-// eslint-disable-next-line import/no-default-export
-export default (
+export const info = (
   { playResX, playResY }: Resolution,
   { filename, title }: ExtraInfo,
 ) => {

package/src/ass-gen/ass/raw.ts

@@ -9,8 +9,8 @@ import type { Context, Danmaku, SubtitleStyle } from '../types'
 
 type compressType = 'brotli' | 'gzip'
 type baseType = 'base64' | 'base18384'
-const compressTypes = ['brotli', 'gzip']
-const baseTypes = ['base64', 'base18384']
+const compressTypes = new Set(['brotli', 'gzip'])
+const baseTypes = new Set(['base64', 'base18384'])
 
 export interface RawConfig {
   compressType: compressType
@@ -20,7 +20,7 @@ export interface RawConfig {
 function fromUint16Array(array: Uint16Array): string {
   let result = ''
   for (const element of array) {
-    result += String.fromCharCode(element)
+    result += String.fromCodePoint(element)
   }
   return result
 }
@@ -57,20 +57,20 @@ export function deRaw(ass: string):
   else {
     let compressType = lineCompressType.replace(';RawCompressType: ', '').trim()
     let baseType = lineBaseType.replace(';RawBaseType: ', '').trim()
-    if (!compressTypes.includes(compressType)) compressType = 'gzip'
-    if (!baseTypes.includes(baseType)) baseType = 'base64'
+    if (!compressTypes.has(compressType)) compressType = 'gzip'
+    if (!baseTypes.has(baseType)) baseType = 'base64'
     const text = lineRaw.replace(';Raw: ', '').trim()
     const buffer =
       baseType === 'base64'
         ? Buffer.from(text, 'base64')
         : Buffer.from(
-            base16384.decode(Buffer.from(text, 'utf-8').toString('utf-8')),
+            base16384.decode(Buffer.from(text, 'utf8').toString('utf8')),
           )
     let decompress: Buffer
     if (compressType === 'brotli') decompress = brotliDecompressSync(buffer)
     else decompress = gunzipSync(buffer)
     try {
-      return JSON.parse(decompress.toString('utf-8'))
+      return JSON.parse(decompress.toString('utf8'))
     } catch {
       return undefined
     }

package/src/ass-gen/ass/style.ts

@@ -2,8 +2,7 @@ import type { SubtitleStyle } from '../types'
 
 import { formatColor, getDecoratingColor, hexColorToRGB } from '../util'
 
-// eslint-disable-next-line import/no-default-export
-export default ({
+export const style = ({
   fontName,
   fontSize,
   color: configColor,

package/src/ass-gen/config.ts

@@ -11,7 +11,7 @@ import { assign, formatColor, hexColorToRGB } from './util'
 // const convertBlockRule = (rule: string) =>
 //     builtinRules[rule] ? rule : new RegExp(rule)
 
-export default (overrides = {}): SubtitleStyle => {
+export const getConfig = (overrides = {}): SubtitleStyle => {
   const defaults = {
     fontSize: [25, 25, 36],
     fontName: 'SimHei',

package/src/ass-gen/index.ts

@@ -4,9 +4,9 @@ import type { RawConfig } from './ass/raw'
 import type { CanvasCtx, SubtitleStyle } from './types'
 
 import { UniPool } from '..'
-import ass from './ass/create'
+import { ass } from './ass/create'
 import { deRaw } from './ass/raw'
-import getConfig from './config'
+import { getConfig } from './config'
 import { DanmakuList2UniPool, layoutDanmaku } from './util'
 
 export { CanvasCtx }
@@ -65,6 +65,9 @@ export function parseAssRawField(
   options?: UniPoolOptions,
 ): UniPool {
   const raw = deRaw(ass)
-  if (!raw) return UniPool.create()
-  else return DanmakuList2UniPool(raw.list, options)
+  if (raw) {
+    return DanmakuList2UniPool(raw.list, options)
+  } else {
+    return UniPool.create()
+  }
 }

package/src/ass-gen/util/layout.ts

@@ -233,7 +233,7 @@ export const layoutDanmaku = (
   config: SubtitleStyle,
   canvasCtx: CanvasCtx,
 ): UniPool => {
-  const list = [...UniPool2DanmakuLists(inputList)].sort(
+  const list = [...UniPool2DanmakuLists(inputList)].toSorted(
     (x, y) => x.time - y.time,
   )
   const layout = initializeLayout(config, canvasCtx)

package/src/index.ts

@@ -172,17 +172,17 @@ export class UniPool {
     const default_stat: Stat[] = []
     const stats = this.dans.reduce((stat, dan) => {
       const valWithCount = stat.find((i) => i.val === dan[key])
-      if (!valWithCount) {
-        stat.push({ val: dan[key], count: 1 })
-      } else {
+      if (valWithCount) {
         valWithCount.count++
+      } else {
+        stat.push({ val: dan[key], count: 1 })
       }
       return stat
     }, default_stat)
     return stats
   }
   getMost(key: keyof statItems) {
-    return this.getStat(key).sort((a, b) => b.count - a.count)[0]
+    return this.getStat(key).toSorted((a, b) => b.count - a.count)[0]
   }
   get most() {
     return {
@@ -351,7 +351,12 @@ export class UniPool {
   static import(
     file: unknown,
     options?: Options,
+    /**
+     * 加载指定解析模块，为空则全选
+     */
+    mod?: ('json' | 'str' | 'bin')[],
   ): { pool: UniPool; fmt: DM_format } {
+    if (!mod) mod = ['json', 'str', 'bin']
     const err = '无法识别该文件，请手动指定格式！'
     const parseJSON = (
       json: DM_JSON_Artplayer &
@@ -400,49 +405,64 @@ export class UniPool {
     const parseStr = (
       file: string,
     ): { pool: UniPool; fmt: DM_format } | undefined => {
-      try {
-        if (isJSON(file)) {
-          const json = JSON.parse(file)
-          return parseJSON(json)
-        }
-      } catch {}
-      try {
-        const xmlParser = new XMLParser({ ignoreAttributes: false })
-        const xml = xmlParser.parse(file)
-        if (xml?.i?.d)
-          return { pool: this.fromBiliXML(file, options), fmt: 'bili.xml' }
-      } catch {}
-      try {
-        return { pool: this.fromASS(file, options), fmt: 'common.ass' }
-      } catch {}
-    }
-    let errmesg
-    if (isObject(file)) {
-      if (file instanceof ArrayBuffer || file instanceof Uint8Array) {
+      // json-str
+      if (mod.includes('json'))
         try {
-          return { pool: this.fromPb(file), fmt: 'danuni.pb.bin' }
+          if (isJSON(file)) {
+            const json = JSON.parse(file)
+            return parseJSON(json)
+          }
         } catch {}
+      // pure-str (xml/ass)
+      if (mod.includes('str')) {
         try {
-          return { pool: this.fromBiliGrpc(file), fmt: 'bili.pb.bin' }
+          const xmlParser = new XMLParser({ ignoreAttributes: false })
+          const xml = xmlParser.parse(file)
+          if (xml?.i?.d)
+            return { pool: this.fromBiliXML(file, options), fmt: 'bili.xml' }
         } catch {}
         try {
-          return {
-            pool: this.fromBiliCommandGrpc(file),
-            fmt: 'bili.cmd.pb.bin',
-          }
+          return { pool: this.fromASS(file, options), fmt: 'common.ass' }
         } catch {}
+      }
+    }
+    let errmesg
+    if (isObject(file)) {
+      if (file instanceof ArrayBuffer || file instanceof Uint8Array) {
+        // pure-bin (pb)
+        if (mod.includes('bin')) {
+          try {
+            return { pool: this.fromPb(file), fmt: 'danuni.pb.bin' }
+          } catch {}
+          try {
+            return { pool: this.fromBiliGrpc(file), fmt: 'bili.pb.bin' }
+          } catch {}
+          try {
+            return {
+              pool: this.fromBiliCommandGrpc(file),
+              fmt: 'bili.cmd.pb.bin',
+            }
+          } catch {}
+        }
+        // str-bin (pure-str + json-str)
+
         try {
           const fileStr = new TextDecoder().decode(file)
           const prStr = parseStr(fileStr)
-          if (!prStr) errmesg = `${err}(定位: bin->string)`
-          else return prStr
+          if (prStr) {
+            return prStr
+          } else {
+            errmesg = `${err}(定位: bin->string)`
+          }
         } catch {}
-      } else {
+      } else if (mod.includes('json')) {
+        // pure-json
         const prJSON = parseJSON(file as any)
         if (!prJSON) throw new Error(`${err}(定位: json)`)
         return prJSON
       }
     } else if (isString(file)) {
+      // pure-str + json-str
       const prStr = parseStr(file)
       if (!prStr) throw new Error(`${err}(定位: string)`)
       return prStr
@@ -594,6 +614,7 @@ export class UniPool {
     return builder.build({
       '?xml': {
         '@_version': '1.0',
+        // eslint-disable-next-line unicorn/text-encoding-identifier-case
         '@_encoding': 'UTF-8',
       },
       danuni: { ...DanUniConvertTipTemplate, data: this.shared.SOID },
@@ -768,12 +789,15 @@ export class UniPool {
   /**
    * 转换为ASS字幕格式的弹幕，需播放器支持多行ASS渲染
    */
-  toASS(
-    canvasCtx: CanvasCtx,
-    options: AssGenOptions = { substyle: {} },
-  ): string {
+  toASS(canvasCtx: CanvasCtx, options?: AssGenOptions): string {
+    const defaultOptions: AssGenOptions = { substyle: {} }
+    const finalOptions = options ?? defaultOptions
     const fn = this.shared.SOID
-    return generateASS(this, { filename: fn, title: fn, ...options }, canvasCtx)
+    return generateASS(
+      this,
+      { filename: fn, title: fn, ...finalOptions },
+      canvasCtx,
+    )
   }
 }
 

package/src/proto/gen/bili/dm_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.7.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.9.0 with parameter "target=ts"
 // @generated from file bili/dm.proto (package bilibili.community.service.dm.v1, syntax proto3)
 /* eslint-disable */
 

package/src/proto/gen/danuni_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.7.0 with parameter "target=ts"
+// @generated by protoc-gen-es v2.9.0 with parameter "target=ts"
 // @generated from file danuni.proto (package danuni.danmaku.v1, syntax proto3)
 /* eslint-disable */
 

package/src/utils/dm-gen.ts

@@ -585,35 +585,36 @@ export class UniDM {
     type UObj = Partial<UniDMObj> & Pick<UniDMObj, 'SOID'>
     const def: UObj = UniDM.create()
     const dan: UObj = UniDM.create(this)
-    // const prototypes = Object.getOwnPropertyNames(this)
-    for (const key in dan) {
-      const k = key as keyof UObj
-      const v = dan[k]
-      // if (key in prototypes) continue
-      if (key === 'SOID') continue
-      else if (!v) delete dan[k]
-      else if (v === def[k]) delete dan[k]
-      else {
-        if (k === 'attr' && Array.isArray(v) && v.length === 0) delete dan[k]
-        if (k === 'extraStr' && v === '{}') delete dan[k]
+    const shouldKeep = (key: keyof UObj, value: UObj[keyof UObj]) => {
+      if (key === 'SOID') return true
+      if (value === undefined || value === null) return false
+      if (value === def[key]) return false
+      if (key === 'attr' && Array.isArray(value) && value.length === 0)
+        return false
+      if (key === 'extraStr' && value === '{}') return false
+      return true
+    }
+    const result: UObj = { SOID: dan.SOID }
+    for (const key of Object.keys(dan) as (keyof UObj)[]) {
+      const value = dan[key]
+      if (shouldKeep(key, value)) {
+        if (key === 'SOID') continue
+        Reflect.set(result, key, value)
       }
     }
-    return JSON.parse(JSON.stringify(dan)) as UObj
+    return result
   }
   @Expose()
-  downgradeAdvcancedDan(
-    {
-      include,
-      exclude,
-      cleanExtra = false,
-    }: {
-      include?: (keyof Extra)[]
-      exclude?: (keyof Extra)[]
-      cleanExtra?: boolean
-    } = { include: [], exclude: [] },
-  ) {
-    if (!this.extra) return this
-    else {
+  downgradeAdvcancedDan({
+    include,
+    exclude,
+    cleanExtra = false,
+  }: {
+    include?: (keyof Extra)[]
+    exclude?: (keyof Extra)[]
+    cleanExtra?: boolean
+  } = {}) {
+    if (this.extra) {
       if (!include) include = []
       if (!exclude) exclude = []
       const check = (k: keyof Extra) =>
@@ -649,7 +650,7 @@ export class UniDM {
       clone.attr.push(DMAttr.Compatible)
       if (cleanExtra) clone.extraStr = undefined
       return clone
-    }
+    } else return this
   }
   /**
    * 将各种类型的时间进行格式化
@@ -794,7 +795,7 @@ export class UniDM {
         senderID: senderID.toString(),
         // content: args.content,
         ctime: this.transCtime(args.ctime, 's'),
-        weight: args.weight ? args.weight : pool === Pools.Ix ? 1 : 0,
+        weight: args.weight || (pool === Pools.Ix ? 1 : 0),
         pool,
         attr: DMAttrUtils.fromBin(args.attr, PlatformVideoSource.Bilibili),
         platform: PlatformVideoSource.Bilibili,

package/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.9.2"}
+{"version":"5.9.3"}