@xpadev-net/niconicomments 0.2.44 → 0.2.46

package/dist/bundle.d.ts

@@ -21,7 +21,6 @@ declare class FlashComment implements IComment {
     get owner(): boolean;
     get mail(): string[];
     get lineCount(): number;
-    parseCommand(comment: formattedComment): parsedCommand;
     parseCommandAndNicoscript(comment: formattedComment): formattedCommentWithFont;
     measureText(comment: measureTextInput): measureTextResult;
     getCommentSize(parsedData: formattedCommentWithFont): formattedCommentWithSize;
@@ -410,7 +409,7 @@ export type v1Thread = {
   id: string;
   fork: string;
   commentCount: number;
-  comments: { [key: string]: v1Comment };
+  comments: v1Comment[];
 };
 type v1Comment = {
   id: string;
@@ -489,6 +488,7 @@ type formattedCommentWithFont = {
   font: commentFont;
   color: string;
   strokeColor?: string;
+  wakuColor?: string;
   full: boolean;
   ender: boolean;
   _live: boolean;
@@ -590,6 +590,7 @@ type parsedCommand = {
   fontSize: number | undefined;
   color: string | undefined;
   strokeColor?: string;
+  wakuColor?: string;
   font: commentFont | undefined;
   full: boolean;
   ender: boolean;
@@ -782,6 +783,7 @@ declare const typeGuard: {
 
 
 
+
 declare const getPosY: (currentPos: number, targetComment: IComment, collision: IComment[] | undefined) => {
     currentPos: number;
     isChanged: boolean;
@@ -800,6 +802,10 @@ declare const isFlashComment: (comment: formattedComment) => boolean;
 declare const parseCommandAndNicoScript: (comment: formattedComment) => formattedCommentWithFont;
 declare const getStrokeColor: (comment: formattedCommentWithSize) => string;
 declare const ArrayEqual: (a: unknown[], b: unknown[]) => boolean;
+declare const getFlashFontIndex: (part: string) => commentContentIndex[];
+declare const getFlashFontName: (font: string) => commentFlashFont;
+declare const getValue: <T>(value: T | null | undefined, alternative: T) => T;
+declare const nativeSort: <T>(getter: (input: T) => number) => (a: T, b: T) => 0 | 1 | -1;
 
 
 export default NiconiComments;

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.44
+  niconicomments.js v0.2.46
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -137,12 +137,11 @@
                 return false;
             if (!i.documentElement.children)
                 return false;
-            for (var index = 0; index < i.documentElement.children.length; index++) {
-                var value = i.documentElement.children[index];
-                if (!value)
+            for (var _i = 0, _a = Array.from(i.documentElement.children); _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!element || element.nodeName !== "chat")
                     continue;
-                if (value.nodeName === "chat" &&
-                    !typeAttributeVerify(value, ["no", "vpos", "date", "date_usec", "mail"]))
+                if (!typeAttributeVerify(element, ["vpos", "date"]))
                     return false;
             }
             return true;
@@ -197,9 +196,9 @@
             thread: function (i) {
                 if (!objectVerify(i, ["id", "fork", "commentCount", "comments"]))
                     return false;
-                for (var _i = 0, _a = Object.keys(i.comments); _i < _a.length; _i++) {
-                    var item = _a[_i];
-                    if (!typeGuard.v1.comment(i.comments[item]))
+                for (var _i = 0, _a = i.comments; _i < _a.length; _i++) {
+                    var value = _a[_i];
+                    if (!typeGuard.v1.comment(value))
                         return false;
                 }
                 return true;
@@ -346,16 +345,17 @@
     var fromXMLDocument = function (data) {
         var _a;
         var data_ = [], userList = [];
+        var index = Array.from(data.documentElement.children).length;
         for (var _i = 0, _b = Array.from(data.documentElement.children); _i < _b.length; _i++) {
             var item = _b[_i];
             if (item.nodeName !== "chat")
                 continue;
             var tmpParam = {
-                id: Number(item.getAttribute("no")),
+                id: Number(item.getAttribute("no")) || index++,
                 vpos: Number(item.getAttribute("vpos")),
                 content: item.innerHTML,
-                date: Number(item.getAttribute("date")),
-                date_usec: Number(item.getAttribute("date_usec")),
+                date: Number(item.getAttribute("date")) || 0,
+                date_usec: Number(item.getAttribute("date_usec")) || 0,
                 owner: !item.getAttribute("user_id"),
                 premium: item.getAttribute("premium") === "1",
                 mail: [],
@@ -396,9 +396,9 @@
     };
     var fromLegacy = function (data) {
         var data_ = [], userList = [];
-        for (var i = 0; i < data.length; i++) {
-            var val = data[i];
-            if (!val || !typeGuard.legacy.apiChat(val === null || val === void 0 ? void 0 : val.chat))
+        for (var _i = 0, data_1 = data; _i < data_1.length; _i++) {
+            var val = data_1[_i];
+            if (!typeGuard.legacy.apiChat(val.chat))
                 continue;
             var value = val.chat;
             if (value.deleted !== 1) {
@@ -497,14 +497,11 @@
     };
     var fromV1 = function (data) {
         var data_ = [], userList = [];
-        for (var _i = 0, data_1 = data; _i < data_1.length; _i++) {
-            var item = data_1[_i];
+        for (var _i = 0, data_2 = data; _i < data_2.length; _i++) {
+            var item = data_2[_i];
             var val = item.comments, forkName = item.fork;
-            for (var _a = 0, _b = Object.keys(val); _a < _b.length; _a++) {
-                var key = _b[_a];
-                var value = val[key];
-                if (!value)
-                    continue;
+            for (var _a = 0, val_1 = val; _a < val_1.length; _a++) {
+                var value = val_1[_a];
                 var tmpParam = {
                     id: value.no,
                     vpos: Math.floor(value.vposMs / 10),
@@ -1282,6 +1279,7 @@
             fontSize: undefined,
             color: undefined,
             strokeColor: undefined,
+            wakuColor: undefined,
             font: undefined,
             full: false,
             ender: false,
@@ -1305,6 +1303,15 @@
                     result.strokeColor = match[1].slice(1);
                 }
             }
+            else if (result.wakuColor === undefined &&
+                (match = command.match(/^nico:waku:(.+)$/))) {
+                if (typeGuard.comment.color(match[1])) {
+                    result.wakuColor = colors[match[1]];
+                }
+                else if (typeGuard.comment.colorCode(match[1])) {
+                    result.wakuColor = match[1].slice(1);
+                }
+            }
             else if (result.loc === undefined && typeGuard.comment.loc(command)) {
                 result.loc = command;
             }
@@ -1363,6 +1370,49 @@
         }
         return true;
     };
+    var getFlashFontIndex = function (part) {
+        var regex = {
+            simsunStrong: new RegExp(config.flashChar.simsunStrong),
+            simsunWeak: new RegExp(config.flashChar.simsunWeak),
+            gulim: new RegExp(config.flashChar.gulim),
+            gothic: new RegExp(config.flashChar.gothic),
+        };
+        var index = [];
+        var match;
+        if ((match = regex.simsunStrong.exec(part)) !== null) {
+            index.push({ font: "simsunStrong", index: match.index });
+        }
+        if ((match = regex.simsunWeak.exec(part)) !== null) {
+            index.push({ font: "simsunWeak", index: match.index });
+        }
+        if ((match = regex.gulim.exec(part)) !== null) {
+            index.push({ font: "gulim", index: match.index });
+        }
+        if ((match = regex.gothic.exec(part)) !== null) {
+            index.push({ font: "gothic", index: match.index });
+        }
+        return index;
+    };
+    var getFlashFontName = function (font) {
+        if (font.match("^simsun.+"))
+            return "simsun";
+        if (font === "gothic")
+            return "defont";
+        return font;
+    };
+    var nativeSort = function (getter) {
+        return function (a, b) {
+            if (getter(a) > getter(b)) {
+                return 1;
+            }
+            else if (getter(a) < getter(b)) {
+                return -1;
+            }
+            else {
+                return 0;
+            }
+        };
+    };
 
     var getLineHeight = function (fontSize, isFlash, resized) {
         if (resized === void 0) { resized = false; }
@@ -1387,10 +1437,8 @@
         var _a = getFontSizeAndScale(comment.charSize), fontSize = _a.fontSize, scale = _a.scale, lineWidth = [], itemWidth = [];
         context.font = parseFont(comment.font, fontSize);
         var currentWidth = 0;
-        for (var i = 0; i < comment.content.length; i++) {
-            var item = comment.content[i];
-            if (item === undefined)
-                continue;
+        for (var _i = 0, _b = comment.content; _i < _b.length; _i++) {
+            var item = _b[_i];
             var lines = item.content.split("\n");
             context.font = parseFont(item.font || comment.font, fontSize);
             var width = [];
@@ -1706,6 +1754,10 @@
                 }
                 this.context.drawImage(this.image, posX, posY);
             }
+            if (this.comment.wakuColor) {
+                this.context.strokeStyle = this.comment.wakuColor;
+                this.context.strokeRect(posX, posY, this.comment.width, this.comment.height);
+            }
             if (showCollision) {
                 var scale = getConfig(config.commentScale, false);
                 this.context.strokeStyle = "rgba(0,255,255,1)";
@@ -1776,10 +1828,8 @@
             var leftOffset = 0, lineCount = 0;
             var paddingTop = (10 - scale * 10) *
                 (this.comment.lineCount / config.hiResCommentCorrection);
-            for (var i = 0; i < this.comment.content.length; i++) {
-                var item = this.comment.content[i];
-                if (!item)
-                    continue;
+            for (var _i = 0, _c = this.comment.content; _i < _c.length; _i++) {
+                var item = _c[_i];
                 var lines = item.content.split("\n");
                 for (var j = 0; j < lines.length; j++) {
                     var line = lines[j];
@@ -1904,59 +1954,6 @@
             enumerable: false,
             configurable: true
         });
-        FlashComment.prototype.parseCommand = function (comment) {
-            var metadata = comment.mail;
-            var result = {
-                loc: undefined,
-                size: undefined,
-                fontSize: undefined,
-                color: undefined,
-                font: undefined,
-                full: false,
-                ender: false,
-                _live: false,
-                invisible: false,
-                long: undefined,
-            };
-            for (var _i = 0, metadata_1 = metadata; _i < metadata_1.length; _i++) {
-                var command = metadata_1[_i];
-                command = command.toLowerCase();
-                var match = command.match(/^@([0-9.]+)/);
-                if (match && match[1]) {
-                    result.long = Number(match[1]);
-                }
-                else if (result.loc === undefined && typeGuard.comment.loc(command)) {
-                    result.loc = command;
-                }
-                else if (result.size === undefined && typeGuard.comment.size(command)) {
-                    result.size = command;
-                    result.fontSize = getConfig(config.fontSize, true)[command].default;
-                }
-                else {
-                    if (result.color === undefined) {
-                        var color = config.colors[command];
-                        if (color) {
-                            result.color = color;
-                            continue;
-                        }
-                        else {
-                            var match_1 = command.match(/#[0-9a-z]{3,6}/);
-                            if (match_1 && match_1[0] && comment.premium) {
-                                result.color = match_1[0].toUpperCase();
-                                continue;
-                            }
-                        }
-                    }
-                    if (result.font === undefined && typeGuard.comment.font(command)) {
-                        result.font = command;
-                    }
-                    else if (typeGuard.comment.command.key(command)) {
-                        result[command] = true;
-                    }
-                }
-            }
-            return result;
-        };
         FlashComment.prototype.parseCommandAndNicoscript = function (comment) {
             var _a, _b;
             var data = parseCommandAndNicoScript(comment);
@@ -1964,19 +1961,6 @@
             var parts = (comment.content.match(/\n|[^\n]+/g) || []).map(function (val) {
                 return Array.from(val.match(/[ -~｡-ﾟ]+|[^ -~｡-ﾟ]+/g) || []);
             });
-            var regex = {
-                simsunStrong: new RegExp(config.flashChar.simsunStrong),
-                simsunWeak: new RegExp(config.flashChar.simsunWeak),
-                gulim: new RegExp(config.flashChar.gulim),
-                gothic: new RegExp(config.flashChar.gothic),
-            };
-            var getFontName = function (font) {
-                return font.match("^simsun.+")
-                    ? "simsun"
-                    : font === "gothic"
-                        ? "defont"
-                        : font;
-            };
             var _loop_1 = function (line) {
                 var lineContent = [];
                 for (var _c = 0, line_1 = line; _c < line_1.length; _c++) {
@@ -1985,38 +1969,18 @@
                         lineContent.push({ content: part });
                         continue;
                     }
-                    var index = [];
-                    var match = void 0;
-                    if ((match = regex.simsunStrong.exec(part)) !== null) {
-                        index.push({ font: "simsunStrong", index: match.index });
-                    }
-                    if ((match = regex.simsunWeak.exec(part)) !== null) {
-                        index.push({ font: "simsunWeak", index: match.index });
-                    }
-                    if ((match = regex.gulim.exec(part)) !== null) {
-                        index.push({ font: "gulim", index: match.index });
-                    }
-                    if ((match = regex.gothic.exec(part)) !== null) {
-                        index.push({ font: "gothic", index: match.index });
-                    }
+                    var index = getFlashFontIndex(part);
                     if (index.length === 0) {
                         lineContent.push({ content: part });
                     }
                     else if (index.length === 1 && index[0]) {
-                        lineContent.push({ content: part, font: getFontName(index[0].font) });
+                        lineContent.push({
+                            content: part,
+                            font: getFlashFontName(index[0].font),
+                        });
                     }
                     else {
-                        index.sort(function (a, b) {
-                            if (a.index > b.index) {
-                                return 1;
-                            }
-                            else if (a.index < b.index) {
-                                return -1;
-                            }
-                            else {
-                                return 0;
-                            }
-                        });
+                        index.sort(nativeSort(function (val) { return val.index; }));
                         if (config.flashMode === "xp") {
                             var offset = 0;
                             for (var i = 1; i < index.length; i++) {
@@ -2025,7 +1989,7 @@
                                     continue;
                                 lineContent.push({
                                     content: part.slice(offset, currentVal.index),
-                                    font: getFontName(lastVal.font),
+                                    font: getFlashFontName(lastVal.font),
                                 });
                                 offset = currentVal.index;
                             }
@@ -2033,7 +1997,7 @@
                             if (val_1)
                                 lineContent.push({
                                     content: part.slice(offset),
-                                    font: getFontName(val_1.font),
+                                    font: getFlashFontName(val_1.font),
                                 });
                         }
                         else {
@@ -2045,17 +2009,17 @@
                             if (firstVal.font !== "gothic") {
                                 lineContent.push({
                                     content: part,
-                                    font: getFontName(firstVal.font),
+                                    font: getFlashFontName(firstVal.font),
                                 });
                             }
                             else {
                                 lineContent.push({
                                     content: part.slice(0, secondVal.index),
-                                    font: getFontName(firstVal.font),
+                                    font: getFlashFontName(firstVal.font),
                                 });
                                 lineContent.push({
                                     content: part.slice(secondVal.index),
-                                    font: getFontName(secondVal.font),
+                                    font: getFlashFontName(secondVal.font),
                                 });
                             }
                         }
@@ -2111,15 +2075,13 @@
             }
             var width_arr = [], spacedWidth_arr = [];
             var currentWidth = 0, spacedWidth = 0;
-            for (var i = 0; i < comment.content.length; i++) {
-                var item = comment.content[i];
-                if (item === undefined)
-                    continue;
+            for (var _i = 0, _a = comment.content; _i < _a.length; _i++) {
+                var item = _a[_i];
                 var lines = item.content.split("\n");
                 var widths = [];
                 this.context.font = parseFont(item.font || comment.font, comment.fontSize);
-                for (var i_1 = 0; i_1 < lines.length; i_1++) {
-                    var value = lines[i_1];
+                for (var i = 0; i < lines.length; i++) {
+                    var value = lines[i];
                     if (value === undefined)
                         continue;
                     var measure = this.context.measureText(value);
@@ -2127,7 +2089,7 @@
                     spacedWidth +=
                         measure.width + Math.max(value.length - 1, 0) * config.letterSpacing;
                     widths.push(measure.width);
-                    if (i_1 < lines.length - 1) {
+                    if (i < lines.length - 1) {
                         width_arr.push(currentWidth);
                         spacedWidth_arr.push(spacedWidth);
                         spacedWidth = 0;
@@ -2255,6 +2217,10 @@
                 }
                 this.context.drawImage(this.image, posX, posY);
             }
+            if (this.comment.wakuColor) {
+                this.context.strokeStyle = this.comment.wakuColor;
+                this.context.strokeRect(posX, posY, this.comment.width, this.comment.height);
+            }
             if (showCollision) {
                 this.context.strokeStyle = "rgba(255,0,255,1)";
                 this.context.strokeRect(posX, posY, this.comment.width, this.comment.height);
@@ -2322,10 +2288,8 @@
             context.fillStyle = this.comment.color;
             var lineOffset = this.comment.lineOffset;
             var lastFont = this.comment.font, leftOffset = 0, lineCount = 0;
-            for (var i = 0; i < this.comment.content.length; i++) {
-                var item = this.comment.content[i];
-                if (!item)
-                    continue;
+            for (var _i = 0, _a = this.comment.content; _i < _a.length; _i++) {
+                var item = _a[_i];
                 if (lastFont !== (item.font || this.comment.font)) {
                     lastFont = item.font || this.comment.font;
                     context.font = parseFont(lastFont, this.comment.fontSize);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.44",
+  "version": "0.2.46",
   "description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
   "main": "dist/bundle.js",
   "types": "dist/bundle.d.ts",