@dan-uni/dan-any 0.2.4 → 0.4.7

package/src/utils/dm-gen.ts

@@ -1,7 +1,13 @@
+import TimeFormat from 'hh-mm-ss'
 import type { DM_JSON_BiliCommandGrpc } from '..'
-import type { platfrom } from './id-gen'
+import type { PlatformDanmakuSource } from './platform'
 
-import { createDMID, domainPreset, UniID as ID, platforms } from './id-gen'
+import { createDMID, UniID as ID } from './id-gen'
+import {
+  PlatformDanmakuOnlySource,
+  PlatformDanmakuSources,
+  PlatformVideoSource,
+} from './platform'
 
 const BigIntSerializer = (k: string, v: any) =>
   typeof v === 'bigint' ? v.toString() : v
@@ -18,10 +24,8 @@ function cleanEmptyObjects(obj: object): object {
     const cleanedValue = cleanEmptyObjects(value)
     if (
       cleanedValue !== undefined &&
-      !(
-        typeof cleanedValue === 'object' &&
-        Object.keys(cleanedValue).length === 0
-      )
+      (typeof cleanedValue !== 'object' ||
+        Object.keys(cleanedValue).length !== 0)
     ) {
       cleaned[key] = cleanedValue
     }
@@ -55,10 +59,13 @@ export type DMAttr =
   | 'Protect'
   | 'FromLive'
   | 'HighLike'
-  | 'Compatible'
-  | 'Reported'
+  | 'Compatible' // 由dan-any进行过兼容处理的弹幕，可能丢失部分信息
+  | 'Reported' // 在DanUni上被多人举报过的弹幕
+  | 'Unchecked' // 在DanUni上未被审核过的弹幕
+  | 'HasEvent' // 该弹幕当前在DanUni上存在事件(如点赞/举报等)
+  | 'Hide' // 由于其它原因需要隐藏的弹幕(建议在server端不返回该类弹幕)
 const DMAttrUtils = {
-  fromBin(bin: number = 0, format?: platfrom) {
+  fromBin(bin: number = 0, format?: PlatformDanmakuSource) {
     const array = toBits(bin),
       attr: DMAttr[] = []
     if (format === 'bili') {
@@ -75,7 +82,7 @@ const DMAttrUtils = {
      * 但由于不知道B站及其它使用该参数程序的读取逻辑，
      * 所以单独提供 bili 格式
      */
-    format?: platfrom,
+    format?: PlatformDanmakuSource,
   ) {
     const bin = new SetBin(0)
     if (format === 'bili') {
@@ -128,7 +135,7 @@ const DMAttrUtils = {
 
 interface DMBili {
   id: bigint // xml 7
-  progress: number // xml 0
+  progress: number // xml 0 ; xml s, protobuf ms
   mode: number // xml 1
   fontsize: number // xml 2
   color: number // xml 3
@@ -208,8 +215,8 @@ interface ExtraArtplayer {
   border?: boolean
 }
 interface ExtraBili {
-  mode: number //原弹幕类型
-  pool: number //原弹幕池
+  mode?: number //原弹幕类型
+  pool?: number //原弹幕池
   adv?: string
   code?: string
   bas?: string
@@ -231,6 +238,8 @@ export interface ExtraDanUniMerge {
   duration: number //持续时间(重复内容第一次出现时间开始到合并了的弹幕中最后一次出现的时间)
   count: number //重复次数
   senders: string[] //发送者
+  taolu_count: number //类似弹幕数量
+  taolu_senders: string[] //类似弹幕发送者
 }
 export enum ExtraDanUniChapterType {
   Chapter = 'ch', //其它片段(用于标记章节)
@@ -240,10 +249,24 @@ export enum ExtraDanUniChapterType {
   ED = 'ed', //片尾
   Preview = 'prvw', //预告
   Cut = 'cut', //删减(删减版中提供删减说明,提供开始位置、长度)
-  Duplicates = 'dup', //补档(完整版中指明其它平台中删减位置)
+  Duplicate = 'dup', //补档(完整版中指明其它平台中删减位置)
   AdBiz = 'biz', //商业广告
   AdUnpaid = 'promo', //推广(无偿/公益)广告
 }
+const ExtraDanUniChapterTypeDict = {
+  chs: {
+    ch: '其它片段',
+    rev: '回顾',
+    op: '片头',
+    int: '中场',
+    ed: '片尾',
+    prvw: '预告',
+    cut: '删减',
+    dup: '补档',
+    biz: '商业广告',
+    promo: '推广',
+  },
+}
 export enum ExtraDanUniChapterAction {
   Disabled = -1,
   ShowOverlay,
@@ -273,7 +296,7 @@ export type ctime = string | number | bigint | Date
 // }
 
 export interface UniDMObj {
-  FCID: string
+  SOID: string
   progress: number
   mode: Modes
   fontsize: number
@@ -284,8 +307,7 @@ export interface UniDMObj {
   weight: number
   pool: Pools
   attr: DMAttr[]
-  platform: platfrom | string
-  SPMO: string
+  platform: PlatformDanmakuSource | string
   extra: string | Extra
   extraStr: string
   DMID: string
@@ -301,15 +323,16 @@ export class UniDM {
   // syncAnchor = BigInt(Date.now())
   constructor(
     /**
-     * FCID
+     * 资源ID
+     * @description 由某一danuni服务确定的某一剧集下不同资源(不同视频站/字幕组具有细节差异)的ID
      */
-    public FCID: string,
+    public SOID: string,
     /**
      * 弹幕出现位置(单位s;精度为ms,即保留三位小数)
      */
     public progress: number = 0,
     /**
-     * 类型 1 2 3:普通弹幕 4:底部弹幕 5:顶部弹幕 6:逆向弹幕 7:高级弹幕 8:代码弹幕 9:BAS弹幕(pool必须为2)
+     * 弹幕类型
      */
     public mode: Modes = Modes.Normal,
     /**
@@ -343,9 +366,9 @@ export class UniDM {
      * 权重 用于屏蔽等级 区间:[1,10]
      * @description 参考B站，源弹幕有该参数则直接利用，
      * 本实现默认取5，再经过ruleset匹配加减分数
-     * @description 特殊情况下接受值为0，即设置0需转换为默认权重(5)
+     * @description 为0时表示暂时未计算权重
      */
-    public weight: number = 5,
+    public weight: number = 0,
     /**
      * 弹幕池 0:普通池 1:字幕池 2:特殊池(代码/BAS弹幕) 3:互动池(互动弹幕中选择投票快速发送的弹幕)
      */
@@ -359,18 +382,7 @@ export class UniDM {
      * 初始来源平台
      * `danuni`与任意空值(可隐式转换为false的值)等价
      */
-    public platform?: platfrom | string,
-    /**
-     * Same Platform Multiple Origin
-     * @description 解决B站等同一番剧存在港澳台站、多语言配音(不同一CID)的问题，同时方便过滤
-     * @description 示例:
-     * - main: 主站
-     * - hm: 仅港澳
-     * - t: 仅台
-     * - hmt: 仅港澳台
-     * - lang:{ISO语言代号}: 多语言
-     */
-    public SPMO?: string,
+    public platform?: PlatformDanmakuSource | string,
     /**
      * 弹幕原始数据(不推荐使用)
      * @description 适用于无法解析的B站代码弹幕、Artplayer弹幕样式等
@@ -386,7 +398,7 @@ export class UniDM {
     if (fontsize <= 0) this.fontsize = 25
     if (color <= 0) this.color = 16777215 //虽然不知道为0是否为可用值，但过为少见，利用其作为默认位
     // if (ctime <= 0n) this.ctime = BigInt(Date.now())
-    if (weight <= 0 || weight > 10) this.weight = 5
+    if (weight < 0 || weight > 10) this.weight = 5
     if (pool < Pools.Def || pool > Pools.Ix) this.pool = Pools.Def
     // if (attr < 0 || attr > 0b111) this.attr = 0
     if (!DMID) DMID = this.toDMID()
@@ -399,7 +411,7 @@ export class UniDM {
   static create(args?: Partial<UniDMObj>) {
     return args
       ? new UniDM(
-          args.FCID || ID.fromNull().toString(),
+          args.SOID || ID.fromNull().toString(),
           args.progress,
           args.mode,
           args.fontsize,
@@ -411,7 +423,6 @@ export class UniDM {
           args.pool,
           args.attr,
           args.platform,
-          args.SPMO,
           typeof args.extra === 'object'
             ? JSON.stringify(args.extra)
             : args.extra || args.extraStr,
@@ -426,14 +437,17 @@ export class UniDM {
     // return cleanEmptyObjects(extra) as Extra
   }
   get isFrom3rdPlatform() {
-    if (this.platform && platforms.includes(this.platform as platfrom))
+    if (
+      this.platform &&
+      PlatformDanmakuSources.includes(this.platform as PlatformDanmakuSource)
+    )
       return true
     else return false
   }
   /**
    * 弹幕id
    * @description sha3-256(content+senderID+ctime)截取前8位
-   * @description 同一FCID下唯一
+   * @description 同一SOID下唯一
    */
   toDMID() {
     return createDMID(this.content, this.senderID, this.ctime)
@@ -442,12 +456,11 @@ export class UniDM {
     const isSame = (k: keyof UniDMObj) => this[k] === dan[k],
       checks = (
         [
-          'FCID',
+          'SOID',
           'content',
           'mode',
           'platform',
           'pool',
-          'SPMO',
         ] satisfies (keyof UniDMObj)[]
       ).every((k) => isSame(k))
     // 如果两个对象的extra都是空对象，只检查基本字段
@@ -484,7 +497,7 @@ export class UniDM {
     )
   }
   minify() {
-    type UObj = Partial<UniDMObj> & Pick<UniDMObj, 'FCID'>
+    type UObj = Partial<UniDMObj> & Pick<UniDMObj, 'SOID'>
     const def: UObj = UniDM.create(),
       dan: UObj = UniDM.create(this)
     // const prototypes = Object.getOwnPropertyNames(this)
@@ -492,7 +505,7 @@ export class UniDM {
       const k = key as keyof UObj,
         v = dan[k]
       // if (key in prototypes) continue
-      if (key === 'FCID') continue
+      if (key === 'SOID') continue
       else if (!v) delete dan[k]
       else if (v === def[k]) delete dan[k]
       else {
@@ -502,10 +515,54 @@ export class UniDM {
     }
     return JSON.parse(JSON.stringify(dan)) as UObj
   }
-  downgradeAdvcancedDan() {
+  downgradeAdvcancedDan(
+    {
+      include,
+      exclude,
+      cleanExtra = false,
+    }: {
+      include?: (keyof Extra)[]
+      exclude?: (keyof Extra)[]
+      cleanExtra?: boolean
+    } = { include: [], exclude: [] },
+  ) {
     if (!this.extra) return this
     else {
+      if (!include) include = []
+      if (!exclude) exclude = []
+      const check = (k: keyof Extra) =>
+        include?.includes(k) || !exclude?.includes(k)
       // TODO 分别对 mode7/8/9 command artplayer等正常播放器无法绘制的弹幕做降级处理
+      const clone = UniDM.create(this)
+      clone.mode = Modes.Top
+      if (check('danuni') && clone.extra.danuni) {
+        const danuni = clone.extra.danuni
+        if (danuni.merge) {
+          const merge = danuni.merge
+          clone.content = `${this.content} x${merge.count}`
+        } else if (danuni.chapter) {
+          const chapter = danuni.chapter
+          if (chapter.type === ExtraDanUniChapterType.Cut)
+            clone.content = `[提示]${clone.platform}源${ExtraDanUniChapterTypeDict.chs[chapter.type]}了${chapter.duration}秒`
+          else if (chapter.type === ExtraDanUniChapterType.Duplicate)
+            clone.content = `[提示(${ExtraDanUniChapterTypeDict.chs[chapter.type]})]${clone.platform}源-${chapter.duration}秒`
+          else
+            clone.content = `[空降(${ExtraDanUniChapterTypeDict.chs[chapter.type]})]${TimeFormat.fromS(clone.progress + chapter.duration)}`
+        }
+      } else if (check('bili') && clone.extra.bili) {
+        const bili = clone.extra.bili
+        if (bili.mode === 7 && bili.adv) {
+          clone.content = `[B站高级弹幕]${JSON.parse(bili.adv)[4] || ''}`
+        } else if (bili.command) {
+          const command = bili.command
+          clone.content = `[B站指令弹幕]${command.content}`
+          clone.fontsize = 36
+        }
+      }
+      clone.senderID = 'compat[bot]@dan-any'
+      clone.attr.push('Compatible')
+      if (cleanExtra) clone.extraStr = undefined
+      return clone
     }
   }
   /**
@@ -547,6 +604,7 @@ export class UniDM {
     let mode = Modes.Normal
     switch (fmt) {
       case 'bili':
+        // 类型 1 2 3:普通弹幕 4:底部弹幕 5:顶部弹幕 6:逆向弹幕 7:高级弹幕 8:代码弹幕 9:BAS弹幕(pool必须为2)
         switch (oriMode) {
           case 4:
             mode = Modes.Bottom
@@ -591,12 +649,12 @@ export class UniDM {
     }
     return mode
   }
-  static fromBili(args: DMBili, SPMO?: string, cid?: bigint) {
+  static fromBili(args: DMBili, cid?: bigint) {
     interface TExtra extends Extra {
       bili: ExtraBili
     }
     if (args.oid && !cid) cid = args.oid
-    const FCID = ID.fromBili({ cid }),
+    const SOID = `def::${ID.fromBili({ cid })}`,
       senderID = ID.fromBili({ midHash: args.midHash })
     let mode = Modes.Normal
     const pool = args.pool, //暂时不做处理，兼容bili的pool格式
@@ -634,7 +692,7 @@ export class UniDM {
     // else if (args.mode === 9) extra.bili.bas = args.content
     return this.create({
       ...args,
-      FCID: FCID.toString(),
+      SOID: SOID.toString(),
       // progress: args.progress,
       mode,
       // fontsize: args.fontsize,
@@ -644,9 +702,8 @@ export class UniDM {
       ctime: this.transCtime(args.ctime, 's'),
       weight: args.weight ? args.weight : pool === Pools.Ix ? 1 : 0,
       pool,
-      attr: DMAttrUtils.fromBin(args.attr, 'bili'),
-      platform: domainPreset.bili,
-      SPMO,
+      attr: DMAttrUtils.fromBin(args.attr, PlatformVideoSource.Bilibili),
+      platform: PlatformVideoSource.Bilibili,
       // 需改进，7=>advanced 8=>code 9=>bas 互动=>command
       // 同时塞进无法/无需直接解析的数据
       // 另开一个解析器，为大部分播放器（无法解析该类dm）做文本类型降级处理
@@ -654,13 +711,13 @@ export class UniDM {
         args.mode >= 7 ? JSON.stringify(extra, BigIntSerializer) : undefined,
     })
   }
-  static fromBiliCommand(args: DMBiliCommand, SPMO?: string, cid?: bigint) {
+  static fromBiliCommand(args: DMBiliCommand, cid?: bigint) {
     if (args.oid && !cid) cid = args.oid
-    const FCID = ID.fromBili({ cid }),
+    const SOID = ID.fromBili({ cid }),
       senderID = ID.fromBili({ mid: args.mid })
     return this.create({
       ...args,
-      FCID: FCID.toString(),
+      SOID: SOID.toString(),
       // progress: args.progress,
       mode: Modes.Ext,
       // fontsize: args.fontsize,
@@ -671,8 +728,7 @@ export class UniDM {
       weight: 10,
       pool: Pools.Adv,
       attr: ['Protect'],
-      platform: domainPreset.bili,
-      SPMO,
+      platform: PlatformVideoSource.Bilibili,
       extra: JSON.stringify(
         {
           bili: {
@@ -684,11 +740,11 @@ export class UniDM {
     })
   }
   static fromDplayer(args: DMDplayer, playerID: string, domain: string) {
-    const FCID = ID.fromUnknown(playerID, domain),
+    const SOID = ID.fromUnknown(playerID, domain),
       senderID = ID.fromUnknown(args.midHash, domain)
     return this.create({
       ...args,
-      FCID: FCID.toString(),
+      SOID: SOID.toString(),
       // progress: args.progress,
       mode: this.transMode(args.mode, 'dplayer'),
       // fontsize: 25,
@@ -711,7 +767,7 @@ export class UniDM {
     }
   }
   static fromArtplayer(args: DMArtplayer, playerID: string, domain: string) {
-    const FCID = ID.fromUnknown(playerID, domain),
+    const SOID = ID.fromUnknown(playerID, domain),
       senderID = ID.fromUnknown('', domain)
     let extra = args.border
       ? ({ artplayer: { border: args.border, style: {} } } as Extra)
@@ -726,7 +782,7 @@ export class UniDM {
     }
     return this.create({
       ...args,
-      FCID: FCID.toString(),
+      SOID: SOID.toString(),
       // progress: args.progress,
       mode: this.transMode(args.mode, 'artplayer'),
       // fontsize: 25,
@@ -752,12 +808,12 @@ export class UniDM {
   static fromDDplay(
     args: DMDDplay,
     episodeId: string,
-    domain = domainPreset.ddplay,
+    domain = PlatformDanmakuOnlySource.DanDanPlay,
   ) {
-    const FCID = ID.fromUnknown(episodeId, domain)
+    const SOID = ID.fromUnknown(`def::${episodeId}`, domain)
     return this.create({
       ...args,
-      FCID: FCID.toString(),
+      SOID: SOID.toString(),
       // progress: args.progress,
       mode: this.transMode(args.mode, 'ddplay'),
       // fontsize: 25,

package/src/utils/id-gen.ts

@@ -1,44 +1,9 @@
 import jsSHA from 'jssha'
 import type { ctime } from './dm-gen'
+import type { PlatformSource } from './platform'
 
 import { UniDM } from './dm-gen'
-
-export const domainPreset = {
-  // acfun: 'acfun.cn',
-  // baha: 'ani.gamer.com.tw',
-  // bgm: 'bgm.tv',
-  // bili: 'b23.tv',
-  // bglobal: 'biliintl.com',
-  // ddplay: 'dandanplay.com',
-  acfun: 'acfun',
-  baha: 'baha',
-  bgm: 'bgm',
-  bili: 'bili', //b23
-  bglobal: 'bglobal', //bintl
-  ddplay: 'ddplay',
-  tucao: 'tucao',
-}
-
-export type platfrom =
-  | 'acfun'
-  | 'baha'
-  | 'bili'
-  | 'bglobal'
-  | 'ddplay'
-  | 'danuni'
-  | 'tucao'
-  | 'other'
-export const platforms = Object.keys(domainPreset) as platfrom[]
-// export const platforms = [
-//   'acfun',
-//   'baha',
-//   'bili',
-//   'bglobal',
-//   'ddplay',
-//   'danuni',
-//   'tucao',
-//   // 'other',
-// ]
+import { PlatformVideoSource } from './platform'
 
 export class UniID {
   constructor(
@@ -54,22 +19,18 @@ export class UniID {
      * - `{any}.danuni` (若使用IP或无域名，请使用该domain，防止隐私泄露/无法解析)
      * #### 注意
      * - `any`值建议为UUID/ULID/NanoID以防同步错误
-     * ### 非DanUni弹幕服务预设(默认采用其最短服务域名)
-     * - `acfun.cn`
-     * - `ani.gamer.com.tw` (Baha)
-     * - `bgm.tv` (bangumi)
-     * - `b23.tv` (比bilibili.com短，省空间)
-     * - `biliintl.com` (即bilibili.tv)
-     * - `dandanplay.com`
-     * - `tucao` (由于其域名常变，故分配固定解析，运行时解析)
+     * ### 非DanUni弹幕服务建议使用预设，或自行填写域名
      */
-    public domain: string,
+    public domain: PlatformSource | string,
   ) {}
   toString() {
     return `${this.id}@${this.domain}`
   }
-  static fromNull(domain?: string) {
-    return new UniID('anonymous', domain || 'danuni')
+  static fromNull(domain?: PlatformSource | 'runtime' | string) {
+    return new UniID(
+      domain === 'runtime' ? 'runtime' : 'anonymous',
+      domain || 'danuni',
+    )
   }
   static fromBili({
     cid,
@@ -80,31 +41,23 @@ export class UniID {
     mid?: number | bigint
     midHash?: string
   }) {
-    if (cid) return new UniID(cid.toString(), domainPreset.bili)
-    else if (mid) return new UniID(mid.toString(), domainPreset.bili)
-    else if (midHash) return new UniID(midHash, domainPreset.bili)
-    else return this.fromNull(domainPreset.bili)
+    if (cid) return new UniID(cid.toString(), PlatformVideoSource.Bilibili)
+    else if (mid) return new UniID(mid.toString(), PlatformVideoSource.Bilibili)
+    else if (midHash) return new UniID(midHash, PlatformVideoSource.Bilibili)
+    else return this.fromNull(PlatformVideoSource.Bilibili)
   }
   static fromUnknown(
     id: string,
     /**
-     * 可使用预设`acfun` `baha` `bili` `bglobal` `ddplay` `tucao`代替其域名
+     * 可使用预设
      */
-    domain: platfrom | string,
+    domain: PlatformSource | string,
   ) {
-    // domain = preset2domain(domain).domain
     if (id) return new UniID(id, domain)
     else return this.fromNull(domain)
   }
 }
 
-// export function preset2domain(domain: platfrom | string) {
-//   for (const [k, v] of Object.entries(domainPreset)) {
-//     if (domain === k) return { platform: k, domain: v }
-//   }
-//   return { platform: 'other', domain: domain }
-// }
-
 export function createDMID(
   content: string = '',
   senderID: string,

package/src/utils/platform.ts

@@ -0,0 +1,38 @@
+export enum PlatformInfoSource {
+  Bangumi = 'bgm',
+  TMDB = 'tmdb',
+}
+export const PlatformInfoSources = Object.values(PlatformInfoSource)
+
+export enum PlatformVideoSource {
+  Acfun = 'acfun',
+  Baha = 'baha',
+  Bilibili = 'bili',
+  BilibiliGlobal = 'bglobal',
+  Iqiyi = 'iqiyi',
+  Tencent = 'tencent',
+  Youku = 'youku',
+}
+export const PlatformVideoSources = Object.values(PlatformVideoSource)
+
+export enum PlatformDanmakuOnlySource {
+  DanDanPlay = 'ddplay',
+  TuCao = 'tucao',
+}
+export const PlatformDanmakuOnlySources = Object.values(
+  PlatformDanmakuOnlySource,
+)
+
+export type PlatformDanmakuSource =
+  | PlatformVideoSource
+  | PlatformDanmakuOnlySource
+export const PlatformDanmakuSources = [
+  ...PlatformVideoSources,
+  ...PlatformDanmakuOnlySources,
+]
+
+export type PlatformSource = PlatformInfoSource | PlatformDanmakuSource
+export const PlatformSources = [
+  ...PlatformInfoSources,
+  ...PlatformDanmakuSources,
+]

package/tsconfig.json

@@ -9,7 +9,7 @@
     // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
     /* Language and Environment */
-    "target": "ES2021", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
@@ -22,7 +22,7 @@
     // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
     /* Modules */
-    "module": "ESNext", /* Skip type checking all .d.ts files. */
+    "module": "ESNext" /* Skip type checking all .d.ts files. */,
     "moduleResolution": "Node",
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
@@ -37,13 +37,13 @@
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    "resolveJsonModule": true, /* Enable importing .json files. */
-    "allowImportingTsExtensions": true, /* Ensure that casing is correct in imports. */
+    "resolveJsonModule": true /* Enable importing .json files. */,
+    "allowImportingTsExtensions": true /* Ensure that casing is correct in imports. */,
     /* Type Checking */
-    "strict": true, /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
     "noImplicitAny": true,
     "declaration": true,
-    "emitDeclarationOnly": true, /* Specify what module code is generated. */
+    "emitDeclarationOnly": true /* Specify what module code is generated. */,
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
     /* JavaScript Support */
@@ -57,7 +57,7 @@
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-    "outDir": "./types", /* Specify an output folder for all emitted files. */
+    "outDir": "./types" /* Specify an output folder for all emitted files. */,
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
@@ -77,9 +77,9 @@
     // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
     // "isolatedDeclarations": true,                     /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+    "forceConsistentCasingInFileNames": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */,
     // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
     // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
@@ -101,10 +101,6 @@
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true
   },
-  "include": [
-    "**/src"
-  ],
-  "exclude": [
-    "**/node_modules"
-  ]
-}
+  "include": ["**/src"],
+  "exclude": ["**/node_modules"]
+}