@xpadev-net/niconicomments 0.2.18 → 0.2.21

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.18
+  niconicomments.js v0.2.21
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -25,21 +25,385 @@
       return _assign.apply(this, arguments);
     };
 
+    var typeGuard = {
+        formatted: {
+            comment: function (i) {
+                return typeVerify(i, ["id", "vpos", "content", "date", "date_usec", "owner", "premium", "mail", "user_id", "layer"]);
+            },
+            comments: function (i) {
+                if (typeof i !== "object")
+                    return false;
+                for (var _i = 0, i_1 = i; _i < i_1.length; _i++) {
+                    var item = i_1[_i];
+                    if (!typeGuard.formatted.comment(item))
+                        return false;
+                }
+                return true;
+            },
+            legacyComment: function (i) {
+                return typeVerify(i, ["id", "vpos", "content", "date", "owner", "premium", "mail"]);
+            },
+            legacyComments: function (i) {
+                if (typeof i !== "object")
+                    return false;
+                for (var _i = 0, i_2 = i; _i < i_2.length; _i++) {
+                    var item = i_2[_i];
+                    if (!typeGuard.formatted.legacyComment(item))
+                        return false;
+                }
+                return true;
+            }
+        },
+        legacy: {
+            rawApiResponses: function (i) {
+                if (typeof i !== "object")
+                    return false;
+                for (var _i = 0, i_3 = i; _i < i_3.length; _i++) {
+                    var itemWrapper = i_3[_i];
+                    for (var _a = 0, itemWrapper_1 = itemWrapper; _a < itemWrapper_1.length; _a++) {
+                        var item = itemWrapper_1[_a];
+                        if (!(item.chat && typeGuard.legacy.apiChat(item) || typeGuard.legacy.apiGlobalNumRes(item) || typeGuard.legacy.apiLeaf(item) || typeGuard.legacy.apiPing(item) || typeGuard.legacy.apiThread(item))) {
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            },
+            apiChat: function (i) {
+                return typeVerify(i, ["anonymity", "content", "date", "date_usec", "no", "thread", "vpos"]);
+            },
+            apiGlobalNumRes: function (i) {
+                return typeVerify(i, ["num_res", "thread"]);
+            },
+            apiLeaf: function (i) {
+                return typeVerify(i, ["count", "thread"]);
+            },
+            apiPing: function (i) {
+                return typeVerify(i, ["content"]);
+            },
+            apiThread: function (i) {
+                return typeVerify(i, ["resultcode", "revision", "server_time", "thread", "ticket"]);
+            },
+        },
+        niconicome: {
+            xmlDocument: function (i) {
+                if (!i.documentElement || i.documentElement.nodeName !== "packet")
+                    return false;
+                if (!i.documentElement.children)
+                    return false;
+                for (var index in Array.from(i.documentElement.children)) {
+                    var value = i.documentElement.children[index];
+                    if (index === "0") {
+                        if (value.nodeName !== "thread" || !typeAttributeVerify(value, ["resultcode", "thread", "server_time", "last_res", "revision"]))
+                            return false;
+                    }
+                    else {
+                        if (value.nodeName !== "chat" || !typeAttributeVerify(value, ["thread", "no", "vpos", "date", "date_usec", "anonymity", "user_id", "mail", "leaf", "premium", "score"]))
+                            return false;
+                    }
+                }
+                return true;
+            }
+        },
+        legacyOwner: {
+            comments: function (i) {
+                var lists = i.split("\n");
+                for (var list in lists) {
+                    if (list.split(":").length < 3) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        },
+        owner: {
+            comment: function (i) {
+                return typeVerify(i, ["time", "command", "comment"]);
+            },
+            comments: function (i) {
+                if (typeof i !== "object")
+                    return false;
+                for (var _i = 0, i_4 = i; _i < i_4.length; _i++) {
+                    var item = i_4[_i];
+                    if (!typeGuard.owner.comment(item))
+                        return false;
+                }
+                return true;
+            }
+        },
+        v1: {
+            comment: function (i) {
+                return typeVerify(i, ["id", "no", "vposMs", "body", "commands", "userId", "isPremium", "score", "postedAt", "nicoruCount", "nicoruId", "source", "isMyPost"]);
+            },
+            thread: function (i) {
+                if (!typeVerify(i, ["id", "fork", "commentCount", "comments"]))
+                    return false;
+                for (var _i = 0, _a = i.comments; _i < _a.length; _i++) {
+                    var item = _a[_i];
+                    if (!typeGuard.v1.comment(item))
+                        return false;
+                }
+                return true;
+            },
+            threads: function (i) {
+                if (typeof i !== "object")
+                    return false;
+                for (var _i = 0, i_5 = i; _i < i_5.length; _i++) {
+                    var item = i_5[_i];
+                    if (!typeGuard.v1.thread(item))
+                        return false;
+                }
+                return true;
+            },
+        }
+    };
+    var typeVerify = function (item, keys) {
+        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+            var key = keys_1[_i];
+            if (item[key] === undefined)
+                return false;
+        }
+        return true;
+    };
+    var typeAttributeVerify = function (item, keys) {
+        for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
+            var key = keys_2[_i];
+            if (item.getAttribute(key) === null)
+                return false;
+        }
+        return true;
+    };
+
+    var convert2formattedComment = function (data, type) {
+        var result = [];
+        if (typeGuard.niconicome.xmlDocument(data) && type === "niconicome") {
+            result = fromNiconicome(data);
+        }
+        else if (typeGuard.formatted.legacyComments(data) && type === "formatted") {
+            result = fromFormatted(data);
+        }
+        else if (typeGuard.legacy.rawApiResponses(data) && type === "legacy") {
+            result = fromLegacy(data);
+        }
+        else if (typeGuard.owner.comments(data) && type === "owner") {
+            result = fromOwner(data);
+        }
+        else if (typeGuard.v1.threads(data) && type === "v1") {
+            result = fromV1(data);
+        }
+        else {
+            throw new Error("unknown input format");
+        }
+        return sort(result);
+    };
+    var fromNiconicome = function (data) {
+        var data_ = [], userList = [];
+        for (var _i = 0, _a = Array.from(data.documentElement.children); _i < _a.length; _i++) {
+            var item = _a[_i];
+            if (item.nodeName !== "chat")
+                continue;
+            var tmpParam = {
+                id: Number(item.getAttribute("no")),
+                vpos: Number(item.getAttribute("vpos")),
+                content: item.innerHTML,
+                date: Number(item.getAttribute("date")),
+                date_usec: Number(item.getAttribute("date_usec")),
+                owner: !item.getAttribute("user_id"),
+                premium: item.getAttribute("premium") === "1",
+                mail: [],
+                user_id: -1,
+                layer: -1
+            };
+            if (item.getAttribute("mail")) {
+                tmpParam.mail = item.getAttribute("mail").split(/[\s　]/g);
+            }
+            if (tmpParam.content.startsWith("/") && tmpParam.owner) {
+                tmpParam.mail.push("invisible");
+            }
+            var isUserExist = userList.indexOf(item.getAttribute("user_id"));
+            if (isUserExist === -1) {
+                tmpParam.user_id = userList.length;
+                userList.push(item.getAttribute("user_id"));
+            }
+            else {
+                tmpParam.user_id = isUserExist;
+            }
+            data_.push(tmpParam);
+        }
+        return data_;
+    };
+    var fromFormatted = function (data) {
+        var tmpData = data;
+        if (!typeGuard.formatted.comments(data)) {
+            for (var i in tmpData) {
+                tmpData[i].layer = -1;
+                tmpData[i].user_id = 0;
+                if (!tmpData[i].date_usec)
+                    tmpData[i].date_usec = 0;
+            }
+        }
+        return tmpData;
+    };
+    var fromLegacy = function (data) {
+        var data_ = [], userList = [];
+        for (var i = 0; i < data.length; i++) {
+            var val = data[i];
+            if (!val)
+                continue;
+            for (var key in val) {
+                var value = val[key];
+                if (typeGuard.legacy.apiChat(value) && value.deleted !== 1) {
+                    var tmpParam = {
+                        id: value.no,
+                        vpos: value.vpos,
+                        content: value.content,
+                        date: value.date,
+                        date_usec: value.date_usec || 0,
+                        owner: !value.user_id,
+                        premium: value.premium === 1,
+                        mail: [],
+                        user_id: -1,
+                        layer: -1
+                    };
+                    if (value.mail) {
+                        tmpParam.mail = value.mail.split(/[\s　]/g);
+                    }
+                    if (value.content.startsWith("/") && !value.user_id) {
+                        tmpParam.mail.push("invisible");
+                    }
+                    var isUserExist = userList.indexOf(value.mail);
+                    if (isUserExist === -1) {
+                        tmpParam.user_id = userList.length;
+                        userList.push(value.user_id);
+                    }
+                    else {
+                        tmpParam.user_id = isUserExist;
+                    }
+                    data_.push(tmpParam);
+                }
+            }
+        }
+        return data_;
+    };
+    var fromOwner = function (data) {
+        var data_ = [];
+        for (var i = 0; i < data.length; i++) {
+            var value = data[i];
+            var tmpParam = {
+                id: i,
+                vpos: time2vpos(value.time),
+                content: value.comment,
+                date: i,
+                date_usec: 0,
+                owner: true,
+                premium: true,
+                mail: [],
+                user_id: -1,
+                layer: -1
+            };
+            if (value.command) {
+                tmpParam.mail = value.command.split(/[\s　]/g);
+            }
+            if (tmpParam.content.startsWith("/")) {
+                tmpParam.mail.push("invisible");
+            }
+            data_.push(tmpParam);
+        }
+        return data_;
+    };
+    var fromV1 = function (data) {
+        var data_ = [], userList = [];
+        for (var i = 0; i < data.length; i++) {
+            var val = data[i].comments, forkName = data[i].fork;
+            for (var key in val) {
+                var value = val[key];
+                var tmpParam = {
+                    id: value.no,
+                    vpos: Math.floor(value.vposMs * 10),
+                    content: value.body,
+                    date: date2time(value.postedAt),
+                    date_usec: 0,
+                    owner: forkName === "owner",
+                    premium: value.isPremium,
+                    mail: value.commands,
+                    user_id: -1,
+                    layer: -1
+                };
+                if (tmpParam.content.startsWith("/") && tmpParam.owner) {
+                    tmpParam.mail.push("invisible");
+                }
+                var isUserExist = userList.indexOf(value.userId);
+                if (isUserExist === -1) {
+                    tmpParam.user_id = userList.length;
+                    userList.push(value.userId);
+                }
+                else {
+                    tmpParam.user_id = isUserExist;
+                }
+                data_.push(tmpParam);
+            }
+        }
+        return data_;
+    };
+    var sort = function (data) {
+        data.sort(function (a, b) {
+            if (a.vpos < b.vpos)
+                return -1;
+            if (a.vpos > b.vpos)
+                return 1;
+            if (a.date < b.date)
+                return -1;
+            if (a.date > b.date)
+                return 1;
+            if (a.date_usec < b.date_usec)
+                return -1;
+            if (a.date_usec > b.date_usec)
+                return 1;
+            return 0;
+        });
+        return data;
+    };
+    var time2vpos = function (time_str) {
+        var time = time_str.match(/^(\d+):(\d+)\.(\d+)|(\d+):(\d+)|(\d+)\.(\d+)|(\d+)$/);
+        if (time) {
+            if (time[1] !== undefined && time[2] !== undefined && time[3] !== undefined) {
+                return (Number(time[1]) * 60 + Number(time[2])) * 100 + Number(time[3]) / Math.pow(10, time[3].length - 2);
+            }
+            else if (time[4] !== undefined && time[5] !== undefined) {
+                return (Number(time[4]) * 60 + Number(time[5])) * 100;
+            }
+            else if (time[6] !== undefined && time[7] !== undefined) {
+                return Number(time[6]) * 100 + Number(time[7]) / Math.pow(10, time[7].length - 2);
+            }
+            else if (time[8] !== undefined) {
+                return Number(time[8]) * 100;
+            }
+        }
+        return 0;
+    };
+    var date2time = function (date) {
+        return Math.floor(new Date(date).getTime() / 1000);
+    };
+
     var isDebug = false;
     var NiconiComments = (function () {
-        function NiconiComments(canvas, data, options) {
-            if (options === void 0) { options = {
-                useLegacy: false,
+        function NiconiComments(canvas, data, initOptions) {
+            if (initOptions === void 0) { initOptions = {}; }
+            var _this = this;
+            var defaultOptions = {
+                drawAllImageOnLoad: false,
+                format: "default",
                 formatted: false,
-                video: null,
+                debug: false,
+                enableLegacyPiP: false,
+                keepCA: false,
                 showCollision: false,
-                showFPS: false,
                 showCommentCount: false,
-                drawAllImageOnLoad: false,
-                debug: false,
-                enableLegacyPiP: false
-            }; }
-            var _this = this;
+                showFPS: false,
+                useLegacy: false,
+                video: null,
+            };
+            var options = Object.assign(defaultOptions, initOptions);
             isDebug = options.debug;
             var constructorStart = performance.now();
             this.canvas = canvas;
@@ -84,19 +448,27 @@
             this.doubleResizeMaxWidth = {
                 full: {
                     legacy: 3020,
-                    default: 3220
+                    default: 3550
                 },
                 normal: {
                     legacy: 2540,
-                    default: 2740
+                    default: 2650
                 }
             };
-            var parsedData = options.formatted ? data : this.parseData(data);
+            var formatType = options.format;
+            if (options.formatted) {
+                console.warn("Deprecated: options.formatted is no longer recommended. Please use options.format");
+            }
+            if (formatType === "default") {
+                formatType = options.formatted ? "formatted" : "legacy";
+            }
+            var parsedData = convert2formattedComment(data, formatType);
             this.video = options.video ? options.video : null;
             this.showCollision = options.showCollision;
             this.showFPS = options.showFPS;
             this.showCommentCount = options.showCommentCount;
             this.enableLegacyPiP = options.enableLegacyPiP;
+            this.keepCA = options.keepCA;
             this.timeline = {};
             this.nicoScripts = { reverse: [], default: [], replace: [], ban: [] };
             this.collision_right = {};
@@ -115,61 +487,16 @@
             }, 500);
             logger("constructor complete: ".concat(performance.now() - constructorStart, "ms"));
         }
-        NiconiComments.prototype.parseData = function (data) {
-            var parseDataStart = performance.now();
-            var data_ = [];
-            for (var i = 0; i < data.length; i++) {
-                var val = data[i];
-                if (!val)
-                    continue;
-                for (var key in val) {
-                    var value = val[key];
-                    if (isApiChat(value) && value["deleted"] !== 1) {
-                        var tmpParam = {
-                            "id": value["no"],
-                            "vpos": value["vpos"],
-                            "content": value["content"],
-                            "date": value["date"],
-                            "date_usec": value["date_usec"],
-                            "owner": !value["user_id"],
-                            "premium": value["premium"] === 1,
-                            "mail": []
-                        };
-                        if (value["mail"]) {
-                            tmpParam["mail"] = value["mail"].split(/[\s　]/g);
-                        }
-                        if (value["content"].startsWith("/") && !value["user_id"]) {
-                            tmpParam["mail"].push("invisible");
-                        }
-                        data_.push(tmpParam);
-                    }
-                }
-            }
-            data_.sort(function (a, b) {
-                if (a.vpos < b.vpos)
-                    return -1;
-                if (a.vpos > b.vpos)
-                    return 1;
-                if (a.date < b.date)
-                    return -1;
-                if (a.date > b.date)
-                    return 1;
-                if (a.date_usec < b.date_usec)
-                    return -1;
-                if (a.date_usec > b.date_usec)
-                    return 1;
-                return 0;
-            });
-            logger("parseData complete: ".concat(performance.now() - parseDataStart, "ms"));
-            return data_;
-        };
         NiconiComments.prototype.preRendering = function (rawData, drawAll) {
             var preRenderingStart = performance.now();
+            if (this.keepCA) {
+                rawData = changeCALayer(rawData);
+            }
             var parsedData = this.getCommentPos(this.getCommentSize(this.getFont(rawData)));
             this.data = this.sortComment(parsedData);
             if (drawAll) {
                 for (var i in parsedData) {
-                    this.getTextImage(Number(i));
+                    this.getTextImage(Number(i), true);
                 }
             }
             logger("preRendering complete: ".concat(performance.now() - preRenderingStart, "ms"));
@@ -257,7 +584,7 @@
                                 if (left_pos + comment.width_max >= 1880) {
                                     for (var k in this.collision_right[vpos]) {
                                         var l = this.collision_right[vpos][k];
-                                        if ((posY < data[l].posY + data[l].height && posY + comment.height > data[l].posY) && data[l].owner === comment.owner) {
+                                        if ((posY < data[l].posY + data[l].height && posY + comment.height > data[l].posY) && data[l].owner === comment.owner && data[l].layer === comment.layer) {
                                             if (data[l].posY + data[l].height > posY) {
                                                 posY = data[l].posY + data[l].height;
                                                 is_change = true;
@@ -281,7 +608,7 @@
                                 if (left_pos <= 40) {
                                     for (var k in this.collision_left[vpos]) {
                                         var l = this.collision_left[vpos][k];
-                                        if ((posY < data[l].posY + data[l].height && posY + comment.height > data[l].posY) && data[l].owner === comment.owner) {
+                                        if ((posY < data[l].posY + data[l].height && posY + comment.height > data[l].posY) && data[l].owner === comment.owner && data[l].layer === comment.layer) {
                                             if (data[l].posY + data[l].height > posY) {
                                                 posY = data[l].posY + data[l].height;
                                                 is_change = true;
@@ -311,7 +638,6 @@
                     for (var j = beforeVpos; j < comment.long + 125; j++) {
                         var vpos = comment.vpos + j;
                         var left_pos = 1680 - (1680 + comment.width_max) / (comment.long + 125) * j;
-                        console.log(vpos, i, j);
                         arrayPush(this.timeline, vpos, i);
                         if (left_pos + comment.width_max >= 1880) {
                             arrayPush(this.collision_right, vpos, i);
@@ -337,7 +663,7 @@
                             var vpos = comment.vpos + j;
                             for (var k in collision[vpos]) {
                                 var l = collision[vpos][k];
-                                if ((posY < data[l].posY + data[l].height && posY + comment.height > data[l].posY) && data[l].owner === comment.owner) {
+                                if ((posY < data[l].posY + data[l].height && posY + comment.height > data[l].posY) && data[l].owner === comment.owner && data[l].layer === comment.layer) {
                                     if (data[l].posY + data[l].height > posY) {
                                         posY = data[l].posY + data[l].height;
                                         is_change = true;
@@ -448,6 +774,7 @@
             }
             else if (comment.loc !== "naka" && comment.tateresized && (comment.full && width_max > 2120 || !comment.full && width_max > 1440) && !comment.yokoResized) {
                 comment.fontSize = this.fontSize[comment.size].default;
+                comment.lineHeight = this.lineHeight[comment.size].default * 1.05;
                 comment.resized = true;
                 comment.yokoResized = true;
                 this.context.font = parseFont(comment.font, comment.fontSize, this.useLegacy);
@@ -499,7 +826,6 @@
                 }
                 else {
                     posX = 1680 - (1680 + comment.width_max) / (comment.long + 125) * (vpos - comment.vpos + 100);
-                    console.log(vpos - comment.vpos);
                 }
             }
             else if (comment.loc === "shita") {
@@ -519,8 +845,9 @@
                 }
             }
         };
-        NiconiComments.prototype.getTextImage = function (i) {
+        NiconiComments.prototype.getTextImage = function (i, preRendering) {
             var _this = this;
+            if (preRendering === void 0) { preRendering = false; }
             var value = this.data[i];
             if (!value || value.invisible)
                 return;
@@ -553,6 +880,8 @@
                 context.fillText(line, 0, posY);
             }
             this.data[i].image = image;
+            if (preRendering)
+                return;
             setTimeout(function () {
                 if (_this.data[i].image)
                     delete _this.data[i].image;
@@ -869,6 +1198,8 @@
                 for (var i in this.timeline[vpos]) {
                     var index = this.timeline[vpos][Number(i)];
                     var comment = this.data[index];
+                    if (vpos > 23000 && vpos < 23100)
+                        console.log(comment);
                     if (!comment || comment.invisible) {
                         continue;
                     }
@@ -965,12 +1296,46 @@
         }
         return string;
     };
-    var isApiChat = function (item) {
-        return item.no && item.vpos && item.content;
-    };
     var logger = function (msg) {
         if (isDebug)
             console.debug(msg);
+    };
+    var changeCALayer = function (rawData) {
+        var userList = {};
+        var data = [], index = {};
+        for (var i in rawData) {
+            var value = rawData[i];
+            if (value.user_id === undefined || value.user_id === -1)
+                continue;
+            if (userList[value.user_id] === undefined)
+                userList[value.user_id] = 0;
+            if (value.mail.indexOf("ca") > -1 || value.mail.indexOf("patissier") > -1 || value.mail.indexOf("ender") > -1 || value.mail.indexOf("full") > -1) {
+                userList[value.user_id] += 5;
+            }
+            if ((value.content.match(/\r\n|\n|\r/g) || []).length > 2) {
+                userList[value.user_id] += (value.content.match(/\r\n|\n|\r/g) || []).length / 2;
+            }
+            var key = "".concat(value.content, "@@").concat(Array.from(new Set(JSON.parse(JSON.stringify(value.mail)).sort())).filter(function (e) { return !e.match(/@[\d.]+|184|device:.+|patissier|ca/); }).join("")), lastComment = index[key];
+            if (lastComment !== undefined) {
+                if (value.vpos > 29800 && 30200 > value.vpos)
+                    console.log(value.vpos - lastComment.vpos, Math.abs(value.date - lastComment.date));
+                if (value.vpos - lastComment.vpos > 100 || Math.abs(value.date - lastComment.date) < 3600) {
+                    data.push(value);
+                    index[key] = value;
+                }
+            }
+            else {
+                data.push(value);
+                index[key] = value;
+            }
+        }
+        for (var i in data) {
+            var value = data[i];
+            if (userList[value.user_id] !== undefined && userList[value.user_id] >= 10) {
+                value.layer = value.user_id;
+            }
+        }
+        return data;
     };
 
     return NiconiComments;

package/dist/dts/types.d.ts

@@ -0,0 +1,154 @@
+type inputFormatType = "niconicome"|"formatted"|"legacy"|"owner"|"v1"|"default";
+type InitOptions = {
+    useLegacy?: boolean,
+    formatted?: boolean,
+    format?: inputFormatType,
+    video?: HTMLVideoElement | null
+    showCollision?: boolean,
+    showFPS?: boolean,
+    showCommentCount?: boolean,
+    drawAllImageOnLoad?: boolean,
+    debug?: boolean,
+    enableLegacyPiP?: boolean,
+    keepCA?: boolean
+}
+type Options = {
+    useLegacy: boolean,
+    formatted: boolean,
+    format: inputFormatType,
+    video: HTMLVideoElement | null,
+    showCollision: boolean,
+    showFPS: boolean,
+    showCommentCount: boolean,
+    drawAllImageOnLoad: boolean,
+    debug: boolean,
+    enableLegacyPiP: boolean,
+    keepCA: boolean
+}
+type rawApiResponse = {
+    [key: string]: apiPing | apiThread | apiLeaf | apiGlobalNumRes | apiChat
+}
+type apiPing = {
+    "content": string
+}
+type apiThread = {
+    "resultcode": number,
+    "thread": string,
+    "server_time": number,
+    "ticket": string,
+    "revision": number
+}
+type apiLeaf = {
+    "thread": string,
+    "count": number
+}
+type apiGlobalNumRes = {
+    "thread": string,
+    "num_res": number
+}
+type apiChat = {
+    "thread": string,
+    "no": number,
+    "vpos": number,
+    "date": number,
+    "date_usec": number,
+    "nicoru": number,
+    "premium": number,
+    "anonymity": number,
+    "user_id": string,
+    "mail": string,
+    "content": string,
+    "deleted": number
+}
+type formattedComment = {
+    "id": number,
+    "vpos": number,
+    "content": string,
+    "date": number,
+    "date_usec": number,
+    "owner": boolean,
+    "premium": boolean,
+    "mail": string[],
+    "user_id": number,
+    "layer": number,
+}
+type formattedLegacyComment = {
+    "id": number,
+    "vpos": number,
+    "content": string,
+    "date": number,
+    "date_usec": number,
+    "owner": boolean,
+    "premium": boolean,
+    "mail": string[],
+}
+type formattedCommentWithFont = formattedComment & {
+    "loc": string,
+    "size": string,
+    "fontSize": number,
+    "font": string,
+    "color": string,
+    "full": boolean,
+    "ender": boolean,
+    "_live": boolean,
+    "long": number,
+    "invisible": boolean
+}
+type formattedCommentWithSize = formattedCommentWithFont & {
+    "height": number,
+    "width": number,
+    "width_max": number,
+    "width_min": number,
+    "lineHeight": number
+}
+type parsedComment = formattedCommentWithSize & {
+    posY: number,
+    image?: HTMLCanvasElement | boolean
+}
+type measureTextResult = {
+    "width": number,
+    "width_max": number,
+    "width_min": number,
+    "height": number,
+    "resized": boolean,
+    "fontSize": number,
+    "lineHeight": number
+}
+type T_fontSize = {
+    [key: string]: {
+        "default": number,
+        "resized": number
+    }
+}
+type T_doubleResizeMaxWidth = {
+    [key: string]: {
+        "legacy": number,
+        "default": number
+    }
+}
+type v1Thread = {
+    "id": string,
+    "fork": string,
+    "commentCount": number,
+    "comments": { [key: string]:v1Comment }
+}
+type v1Comment = {
+    "id": string,
+    "no": number,
+    "vposMs": number,
+    "body": string,
+    "commands": string[],
+    "userId": string,
+    "isPremium": boolean,
+    "score": number,
+    "postedAt": string,
+    "nicoruCount": number,
+    "nicoruId": null,
+    "source": string,
+    "isMyPost": boolean
+}
+type ownerComment = {
+    "time": string,
+    "command": string,
+    "comment": string
+}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.18",
+  "version": "0.2.21",
   "description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
   "main": "dist/bundle.js",
-  "types": "dist/dts/main.d.ts",
+  "types": "dist/dts/types.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "rollup -c rollup.config.js",
     "watch": "rollup -c rollup.config.js -w",
-    "typedoc": "typedoc --options tsdoc.json --out ./docs/type/ ./src/main.ts",
-    "tsc": "tsc --emitDeclarationOnly",
-    "prepublishOnly": "npm run tsc&&npm run build"
+    "typedoc": "typedoc --entryPointStrategy Expand --options tsdoc.json --out ./docs/type/ ./src/",
+    "copy-dts": "npx copyfiles -u 2 src/@types/*.d.ts dist/dts",
+    "prepublishOnly": "npm run copy-dts&&npm run build"
   },
   "repository": {
     "type": "git",
@@ -25,18 +25,20 @@
   },
   "files": [
     "dist/bundle.js",
-    "dist/dts/main.d.ts",
-    "dist/dts/main.d.ts.map"
+    "dist/dts/types.d.ts"
   ],
   "homepage": "https://xpadev.net/niconicomments/docs/",
   "license": "MIT",
   "devDependencies": {
     "@babel/preset-env": "^7.18.2",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-typescript": "^8.3.2",
-    "rollup": "^2.75.6",
-    "typedoc": "^0.22.17",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-typescript": "^8.3.3",
+    "copyfiles": "^2.4.1",
+    "rollup": "^2.75.7",
+    "rollup-plugin-dts": "^4.2.2",
+    "typedoc": "^0.22.18",
     "typedoc-plugin-missing-exports": "^0.22.6",
-    "typescript": "^4.7.3"
+    "typescript": "^4.7.4"
   }
 }

package/dist/dts/main.d.ts

@@ -1,152 +0,0 @@
-declare type InitOptions = {
-    useLegacy: boolean;
-    formatted: boolean;
-    video: HTMLVideoElement | null;
-    showCollision: boolean;
-    showFPS: boolean;
-    showCommentCount: boolean;
-    drawAllImageOnLoad: boolean;
-    debug: boolean;
-    enableLegacyPiP: boolean;
-};
-declare type rawApiResponse = {
-    [key: string]: apiPing | apiThread | apiLeaf | apiGlobalNumRes | apiChat;
-};
-declare type apiPing = {
-    "content": string;
-};
-declare type apiThread = {
-    "resultcode": number;
-    "thread": string;
-    "server_time": number;
-    "ticket": string;
-    "revision": number;
-};
-declare type apiLeaf = {
-    "thread": string;
-    "count": number;
-};
-declare type apiGlobalNumRes = {
-    "thread": string;
-    "num_res": number;
-};
-declare type apiChat = {
-    "thread": string;
-    "no": number;
-    "vpos": number;
-    "date": number;
-    "date_usec": number;
-    "nicoru": number;
-    "premium": number;
-    "anonymity": number;
-    "user_id": string;
-    "mail": string;
-    "content": string;
-    "deleted": number;
-};
-declare type formattedComment = {
-    "id": number;
-    "vpos": number;
-    "content": string;
-    "date": number;
-    "date_usec": number;
-    "owner": boolean;
-    "premium": boolean;
-    "mail": string[];
-};
-declare type formattedCommentWithFont = formattedComment & {
-    "loc": string;
-    "size": string;
-    "fontSize": number;
-    "font": string;
-    "color": string;
-    "full": boolean;
-    "ender": boolean;
-    "_live": boolean;
-    "long": number;
-    "invisible": boolean;
-};
-declare type formattedCommentWithSize = formattedCommentWithFont & {
-    "height": number;
-    "width": number;
-    "width_max": number;
-    "width_min": number;
-    "lineHeight": number;
-};
-declare type parsedComment = formattedCommentWithSize & {
-    posY: number;
-    image?: HTMLCanvasElement | boolean;
-};
-declare type measureTextResult = {
-    "width": number;
-    "width_max": number;
-    "width_min": number;
-    "height": number;
-    "resized": boolean;
-    "fontSize": number;
-    "lineHeight": number;
-};
-declare class NiconiComments {
-    private canvas;
-    private context;
-    private readonly commentYPaddingTop;
-    private readonly commentYMarginBottom;
-    private readonly fontSize;
-    private readonly lineHeight;
-    private readonly doubleResizeMaxWidth;
-    private video;
-    private showCollision;
-    showFPS: boolean;
-    showCommentCount: boolean;
-    enableLegacyPiP: boolean;
-    private data;
-    private timeline;
-    private nicoScripts;
-    private collision_right;
-    private collision_left;
-    private collision_ue;
-    private collision_shita;
-    private lastVpos;
-    private useLegacy;
-    private fpsCount;
-    private fps;
-    constructor(canvas: HTMLCanvasElement, data: (rawApiResponse | formattedComment)[], options?: InitOptions);
-    parseData(data: rawApiResponse[]): formattedComment[];
-    preRendering(rawData: formattedComment[], drawAll: boolean): void;
-    getFont(parsedData: formattedComment[]): formattedCommentWithFont[];
-    getCommentSize(parsedData: formattedCommentWithFont[]): formattedCommentWithSize[];
-    getCommentPos(parsedData: parsedComment[]): parsedComment[];
-    sortComment(parsedData: parsedComment[]): parsedComment[];
-    measureText(comment: {
-        content: string;
-        resized: boolean;
-        ender: any;
-        size: string;
-        fontSize: number;
-        tateresized: boolean;
-        font: any;
-        loc: string;
-        full: any;
-        yokoResized: boolean;
-        lineHeight: number | undefined;
-    }): measureTextResult;
-    drawText(comment: parsedComment, vpos: number): void;
-    getTextImage(i: number): void;
-    parseCommand(comment: any): {
-        loc: string | null;
-        size: string | null;
-        fontSize: number | null;
-        color: any;
-        font: string | null;
-        full: boolean;
-        ender: boolean;
-        _live: boolean;
-        invisible: boolean;
-        long: any;
-    };
-    parseCommandAndNicoscript(comment: formattedComment): formattedCommentWithFont;
-    drawCanvas(vpos: number): void;
-    clear(): void;
-}
-export default NiconiComments;
-//# sourceMappingURL=main.d.ts.map

package/dist/dts/main.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}