@dan-uni/dan-any 1.2.2 → 1.2.7

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

@@ -14266,6 +14266,7 @@ and limitations under the License.
                 UniDM: ()=>UniDM,
                 UniDMTools: ()=>dm_gen_namespaceObject,
                 UniPool: ()=>UniPool,
+                DM_format: ()=>src_DM_format,
                 UniIDTools: ()=>id_gen_namespaceObject
             });
             var id_gen_namespaceObject = {};
@@ -14754,10 +14755,13 @@ and limitations under the License.
                                 i += 7;
                                 let entityName, val;
                                 [entityName, val, i] = this.readEntityExp(xmlData, i + 1, this.suppressValidationErr);
-                                if (-1 === val.indexOf("&")) entities[entityName] = {
-                                    regx: RegExp(`&${entityName};`, "g"),
-                                    val: val
-                                };
+                                if (-1 === val.indexOf("&")) {
+                                    const escaped = entityName.replace(/[.\-+*:]/g, '\\.');
+                                    entities[entityName] = {
+                                        regx: RegExp(`&${escaped};`, "g"),
+                                        val: val
+                                    };
+                                }
                             } else if (hasBody && hasSeq(xmlData, "!ELEMENT", i)) {
                                 i += 8;
                                 const { index } = this.readElementExp(xmlData, i + 1);
@@ -15107,11 +15111,11 @@ and limitations under the License.
                         },
                         num_dec: {
                             regex: /&#([0-9]{1,7});/g,
-                            val: (_, str)=>String.fromCodePoint(Number.parseInt(str, 10))
+                            val: (_, str)=>fromCodePoint(str, 10, "&#")
                         },
                         num_hex: {
                             regex: /&#x([0-9a-fA-F]{1,6});/g,
-                            val: (_, str)=>String.fromCodePoint(Number.parseInt(str, 16))
+                            val: (_, str)=>fromCodePoint(str, 16, "&#x")
                         }
                     };
                     this.addExternalEntities = addExternalEntities;
@@ -15140,8 +15144,9 @@ and limitations under the License.
                 const entKeys = Object.keys(externalEntities);
                 for(let i = 0; i < entKeys.length; i++){
                     const ent = entKeys[i];
+                    const escaped = ent.replace(/[.\-+*:]/g, '\\.');
                     this.lastEntities[ent] = {
-                        regex: new RegExp("&" + ent + ";", "g"),
+                        regex: new RegExp("&" + escaped + ";", "g"),
                         val: externalEntities[ent]
                     };
                 }
@@ -15487,6 +15492,11 @@ and limitations under the License.
                 if (isExist(val)) return val;
                 return '';
             }
+            function fromCodePoint(str, base, prefix) {
+                const codePoint = Number.parseInt(str, base);
+                if (codePoint >= 0 && codePoint <= 0x10FFFF) return String.fromCodePoint(codePoint);
+                return prefix + str + ";";
+            }
             const node2json_METADATA_SYMBOL = XmlNode.getMetaDataSymbol();
             function prettify(node, options) {
                 return node2json_compress(node, options);
@@ -21043,7 +21053,7 @@ and limitations under the License.
             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.2.2","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.2.7","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;
@@ -23528,7 +23538,7 @@ and limitations under the License.
                     if (this.attr.length > 0) result.attr = this.attr;
                     if (void 0 !== this.platform) result.platform = this.platform;
                     if (this.extraStr && '{}' !== this.extraStr) result.extraStr = this.extraStr;
-                    if (void 0 !== this.DMID) result.DMID = this.DMID;
+                    if (void 0 !== this.DMID && this.options.dmid) result.DMID = this.DMID;
                     return result;
                 }
                 downgradeAdvcancedDan({ include, exclude, cleanExtra = false } = {}) {
@@ -23644,7 +23654,7 @@ and limitations under the License.
                     }) ? args.midHash : id_gen_UniID.fromBili({
                         midHash: args.midHash
                     });
-                    let mode = 0;
+                    let mode;
                     const pool = args.pool;
                     const extra = {
                         bili: {
@@ -24482,6 +24492,19 @@ and limitations under the License.
                 meassage: 'Converted by DanUni!',
                 version: `JS/TS ${package_namespaceObject.UU} (v${package_namespaceObject.rE})`
             };
+            var src_DM_format = /*#__PURE__*/ function(DM_format) {
+                DM_format["DanuniJson"] = "danuni.json";
+                DM_format["DanuniPbBin"] = "danuni.pb.bin";
+                DM_format["BiliXml"] = "bili.xml";
+                DM_format["BiliPbBin"] = "bili.pb.bin";
+                DM_format["BiliCmdPbBin"] = "bili.cmd.pb.bin";
+                DM_format["BiliUpJson"] = "bili.up.json";
+                DM_format["DplayerJson"] = "dplayer.json";
+                DM_format["ArtplayerJson"] = "artplayer.json";
+                DM_format["DdplayJson"] = "ddplay.json";
+                DM_format["CommonAss"] = "common.ass";
+                return DM_format;
+            }({});
             class UniPool {
                 constructor(dans, options = {}, info = {
                     fromConverted: false
@@ -24492,10 +24515,7 @@ and limitations under the License.
                     if (false !== options.dedupe) options.dedupe = true;
                     if (this.options.dedupe) this.dedupe();
                 }
-                async pipe(fn) {
-                    return fn(this);
-                }
-                pipeSync(fn) {
+                pipe(fn) {
                     return fn(this);
                 }
                 get shared() {
@@ -24707,23 +24727,23 @@ and limitations under the License.
                         try {
                             if (Array.isArray(json) && json.every((d)=>d.SOID)) return {
                                 pool: new UniPool(json, options),
-                                fmt: 'danuni.json'
+                                fmt: "danuni.json"
                             };
                             if (json.danmuku && json.danmuku.every((d)=>d.text)) return {
                                 pool: this.fromArtplayer(json, json.danuni?.data ?? '', void 0, options),
-                                fmt: 'artplayer.json'
+                                fmt: "artplayer.json"
                             };
                             if (json.count && json.comments && Array.isArray(json.comments) && json.comments.every((d)=>d.m)) return {
                                 pool: this.fromDDPlay(json, json.danuni?.data ?? '', options),
-                                fmt: 'ddplay.json'
+                                fmt: "ddplay.json"
                             };
                             else if (0 == json.code && json.data && Array.isArray(json.data) && json.data.every((d)=>Array.isArray(d))) return {
                                 pool: this.fromDplayer(json, json.danuni?.data ?? '', void 0, options),
-                                fmt: 'dplayer.json'
+                                fmt: "dplayer.json"
                             };
                             else if (0 == json.code && '0' == json.message && json.data && json.data.page && json.data.result && Array.isArray(json.data.result) && json.data.result.every((d)=>d.id && d.oid)) return {
                                 pool: this.fromBiliUp(json, options),
-                                fmt: 'bili.up.json'
+                                fmt: "bili.up.json"
                             };
                         } catch  {}
                     };
@@ -24742,13 +24762,13 @@ and limitations under the License.
                                 const xml = xmlParser.parse(file);
                                 if (xml?.i?.d) return {
                                     pool: this.fromBiliXML(file, options),
-                                    fmt: 'bili.xml'
+                                    fmt: "bili.xml"
                                 };
                             } catch  {}
                             try {
                                 return {
                                     pool: this.fromASS(file, options),
-                                    fmt: 'common.ass'
+                                    fmt: "common.ass"
                                 };
                             } catch  {}
                         }
@@ -24760,19 +24780,19 @@ and limitations under the License.
                                 try {
                                     return {
                                         pool: this.fromPb(file),
-                                        fmt: 'danuni.pb.bin'
+                                        fmt: "danuni.pb.bin"
                                     };
                                 } catch  {}
                                 try {
                                     return {
                                         pool: this.fromBiliGrpc(file),
-                                        fmt: 'bili.pb.bin'
+                                        fmt: "bili.pb.bin"
                                     };
                                 } catch  {}
                                 try {
                                     return {
                                         pool: this.fromBiliCommandGrpc(file),
-                                        fmt: 'bili.cmd.pb.bin'
+                                        fmt: "bili.cmd.pb.bin"
                                     };
                                 } catch  {}
                             }