@xpadev-net/niconicomments 0.2.36 → 0.2.38

package/LICENSE_JP

@@ -0,0 +1,11 @@
+The MIT License
+===============
+
+Copyright (c) 2021 xpadev https://xpadev.net
+
+以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソフトウェア」）の複製を取得するすべての人に対し、ソフトウェアを無制限に扱うことを無償で許可します。これには、ソフトウェアの複製を使用、複写、変更、結合、掲載、頒布、サブライセンス、および/または販売する権利、およびソフトウェアを提供する相手に同じことを許可する権利も無制限に含まれます。
+
+上記の著作権表示および本許諾表示を、ソフトウェアのすべての複製または重要な部分に記載するものとします。
+
+ソフトウェアは「現状のまま」で、明示であるか暗黙であるかを問わず、何らの保証もなく提供されます。ここでいう保証とは、商品性、特定の目的への適合性、および権利非侵害についての保証も含みますが、それに限定されるものではありません。
+作者または著作権者は、契約行為、不法行為、またはそれ以外であろうと、ソフトウェアに起因または関連し、あるいはソフトウェアの使用またはその他の扱いによって生じる一切の請求、損害、その他の義務について何らの責任も負わないものとします。

package/README.en.md

@@ -1,5 +1,7 @@
 # [niconicomments](https://xpadev.net/niconicomments/)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/xpadev-net/niconicomments/blob/master/LICENSE)
+[![CodeQL](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml)
+[![TypeDoc](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml)
 
 [[日本語](https://github.com/xpadev-net/niconicomments/blob/develop/README.md)]
 

package/README.md

@@ -1,5 +1,7 @@
 # [niconicomments](https://xpadev.net/niconicomments/)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/xpadev-net/niconicomments/blob/master/LICENSE)
+[![CodeQL](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/codeql-analysis.yml)
+[![TypeDoc](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml/badge.svg?branch=master)](https://github.com/xpadev-net/niconicomments/actions/workflows/typedoc.yml)
 
 [[English](https://github.com/xpadev-net/niconicomments/blob/develop/README.en.md)]
 

package/dist/bundle.d.ts

@@ -1,3 +1,6 @@
+import type { IComment } from "@/@types/IComment";
+import type { formattedCommentWithFont, formattedCommentWithSize, measureTextInput, measureTextResult, parsedCommand } from "@/@types/types";
+import type { formattedComment } from "@/@types/format.formatted";
 declare class FlashComment implements IComment {
     private readonly context;
     readonly comment: formattedCommentWithSize;
@@ -8,7 +11,7 @@ declare class FlashComment implements IComment {
     image?: HTMLCanvasElement | null;
     constructor(comment: formattedComment, context: CanvasRenderingContext2D);
     get invisible(): boolean;
-    get loc(): commentLoc;
+    get loc(): import("@/@types/types").commentLoc;
     get long(): number;
     get vpos(): number;
     get width(): number;
@@ -27,6 +30,9 @@ declare class FlashComment implements IComment {
 }
 
 
+import type { IComment } from "@/@types/IComment";
+import type { formattedCommentWithFont, formattedCommentWithSize, measureTextInput, measureTextResult } from "@/@types/types";
+import type { formattedComment } from "@/@types/format.formatted";
 declare class HTML5Comment implements IComment {
     private readonly context;
     readonly comment: formattedCommentWithSize;
@@ -34,7 +40,7 @@ declare class HTML5Comment implements IComment {
     image?: HTMLCanvasElement | null;
     constructor(comment: formattedComment, context: CanvasRenderingContext2D);
     get invisible(): boolean;
-    get loc(): commentLoc;
+    get loc(): import("@/@types/types").commentLoc;
     get long(): number;
     get vpos(): number;
     get width(): number;
@@ -61,6 +67,7 @@ declare let imageCache: {
 declare const resetImageCache: () => void;
 
 
+import type { nicoScript } from "@/@types/types";
 declare let nicoScripts: nicoScript;
 declare const resetNicoScripts: () => void;
 
@@ -96,13 +103,15 @@ declare const colors: {
 };
 
 
-declare let defaultConfig: Config;
+import type { BaseConfig } from "@/@types/config";
+import type { BaseOptions } from "@/@types/options";
+declare let defaultConfig: BaseConfig;
 declare const initConfig: () => void;
-declare const defaultOptions: Options;
-declare let config: Config;
-declare let options: Options;
-declare const setConfig: (value: Config) => Config;
-declare const setOptions: (value: Options) => Options;
+declare const defaultOptions: BaseOptions;
+declare let config: BaseConfig;
+declare let options: BaseOptions;
+declare const setConfig: (value: BaseConfig) => BaseConfig;
+declare const setOptions: (value: BaseOptions) => BaseOptions;
 
 
 declare const fontTemplates: {
@@ -211,68 +220,68 @@ declare const fonts: {
 };
 
 
-type configItem<T> = T | { html5: T; flash: T };
-type configSizeItem<T> = { big: T; medium: T; small: T };
-type configResizedItem<T> = { default: T; resized: T };
-
-type commentStageSize = { width: number; fullWidth: number; height: number };
-
-type flashCharList = {
-  [key in "simsunStrong" | "simsunWeak" | "gulim" | "gothic"]: string;
-};
-type flashMode = "xp" | "vista";
-type flashScriptChar = {
-  [key in "super" | "sub"]: string;
-};
-type fontList = {
-  [key in "gulim" | "simsun"]: string;
-};
-type lineCounts = {
-  [key in "default" | "resized" | "doubleResized"]: configSizeItem<number>;
-};
-type typeDoubleResizeMaxWidth = {
-  [key in "full" | "normal"]: number;
-};
-
-type Config = {
-  cacheAge: number;
-  canvasHeight: number;
-  canvasWidth: number;
-  collisionRange: { [key in "left" | "right"]: number };
-  colors: { [key: string]: string };
-  commentDrawPadding: number;
-  commentDrawRange: number;
-  commentScale: configItem<number>;
-  commentStageSize: configItem<commentStageSize>;
-  commentYMarginBottom: configSizeItem<number>;
-  commentYOffset: configSizeItem<configResizedItem<number>>;
-  commentYPaddingTop: configResizedItem<number>;
-  contextFillLiveOpacity: number;
-  contextLineWidth: number;
-  contextStrokeColor: string;
-  contextStrokeInversionColor: string;
-  contextStrokeOpacity: number;
-  doubleResizeMaxWidth: configItem<typeDoubleResizeMaxWidth>;
-  flashChar: flashCharList;
-  flashMode: flashMode;
-  flashScriptChar: flashScriptChar;
-  flashThreshold: number;
-  font: fontList;
-  fonts: platformFont;
-  fontSize: configItem<configSizeItem<configResizedItem<number>>>;
-  fpsInterval: number;
-  hiResCommentCorrection: number;
-  lineCounts: configItem<lineCounts>;
-  lineHeight: configItem<configSizeItem<configResizedItem<number>>>;
-  minFontSize: number;
-  sameCAGap: number;
-  sameCAMinScore: number;
-  sameCARange: number;
-  letterSpacing: number;
-  scriptCharOffset: number;
-};
-
-type ConfigNullable = Partial<Config>;
+type configItem<T> = T | { html5: T; flash: T };
+type configSizeItem<T> = { big: T; medium: T; small: T };
+type configResizedItem<T> = { default: T; resized: T };
+
+type commentStageSize = { width: number; fullWidth: number; height: number };
+
+type flashCharList = {
+  [key in "simsunStrong" | "simsunWeak" | "gulim" | "gothic"]: string;
+};
+type flashMode = "xp" | "vista";
+type flashScriptChar = {
+  [key in "super" | "sub"]: string;
+};
+type fontList = {
+  [key in "gulim" | "simsun"]: string;
+};
+type lineCounts = {
+  [key in "default" | "resized" | "doubleResized"]: configSizeItem<number>;
+};
+type typeDoubleResizeMaxWidth = {
+  [key in "full" | "normal"]: number;
+};
+
+type BaseConfig = {
+  cacheAge: number;
+  canvasHeight: number;
+  canvasWidth: number;
+  collisionRange: { [key in "left" | "right"]: number };
+  colors: { [key: string]: string };
+  commentDrawPadding: number;
+  commentDrawRange: number;
+  commentScale: configItem<number>;
+  commentStageSize: configItem<commentStageSize>;
+  commentYMarginBottom: configSizeItem<number>;
+  commentYOffset: configSizeItem<configResizedItem<number>>;
+  commentYPaddingTop: configResizedItem<number>;
+  contextFillLiveOpacity: number;
+  contextLineWidth: number;
+  contextStrokeColor: string;
+  contextStrokeInversionColor: string;
+  contextStrokeOpacity: number;
+  doubleResizeMaxWidth: configItem<typeDoubleResizeMaxWidth>;
+  flashChar: flashCharList;
+  flashMode: flashMode;
+  flashScriptChar: flashScriptChar;
+  flashThreshold: number;
+  font: fontList;
+  fonts: platformFont;
+  fontSize: configItem<configSizeItem<configResizedItem<number>>>;
+  fpsInterval: number;
+  hiResCommentCorrection: number;
+  lineCounts: configItem<lineCounts>;
+  lineHeight: configItem<configSizeItem<configResizedItem<number>>>;
+  minFontSize: number;
+  sameCAGap: number;
+  sameCAMinScore: number;
+  sameCARange: number;
+  letterSpacing: number;
+  scriptCharOffset: number;
+};
+
+export type Config = Partial<BaseConfig>;
 
 type platform =
   | "win7"
@@ -292,112 +301,124 @@ type platformFont = {
   [key in HTML5Fonts]: FontItem;
 };
 
-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[];
-};
+export type formattedComment = {
+  id: number;
+  vpos: number;
+  content: string;
+  date: number;
+  date_usec: number;
+  owner: boolean;
+  premium: boolean;
+  mail: string[];
+  user_id: number;
+  layer: number;
+};
+export type formattedLegacyComment = {
+  id: number;
+  vpos: number;
+  content: string;
+  date: number;
+  date_usec: number;
+  owner: boolean;
+  premium: boolean;
+  mail: string[];
+};
 
-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;
-};
+export 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 ownerComment = {
-  time: string;
-  command: string;
-  comment: string;
-};
+export type ownerComment = {
+  time: string;
+  command: string;
+  comment: string;
+};
 
-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: undefined;
-  source: string;
-  isMyPost: boolean;
-};
+export 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: undefined;
+  source: string;
+  isMyPost: boolean;
+};
 
-interface IComment {
-  comment: formattedCommentWithSize;
-  invisible: boolean;
-  loc: commentLoc;
-  width: number;
-  long: number;
-  height: number;
-  vpos: number;
-  flash: boolean;
-  posY: number;
-  owner: boolean;
-  layer: number;
-  mail: string[];
-  image?: HTMLCanvasElement | null;
-  getTextImage: (vpos: number) => void;
-  draw: (vpos: number, showCollision: boolean, isDebug: boolean) => void;
-}
+import { commentLoc, formattedCommentWithSize } from "@/@types/types";
+
+export interface IComment {
+  comment: formattedCommentWithSize;
+  invisible: boolean;
+  loc: commentLoc;
+  width: number;
+  long: number;
+  height: number;
+  vpos: number;
+  flash: boolean;
+  posY: number;
+  owner: boolean;
+  layer: number;
+  mail: string[];
+  image?: HTMLCanvasElement | null;
+  getTextImage: (vpos: number) => void;
+  draw: (vpos: number, showCollision: boolean, isDebug: boolean) => void;
+}
 
-type inputFormatType =
+import {
+  formattedComment,
+  formattedLegacyComment,
+} from "@/@types/format.formatted";
+import { rawApiResponse } from "@/@types/format.legacy";
+import { ownerComment } from "@/@types/format.owner";
+import { v1Thread } from "@/@types/format.v1";
+import { Config } from "@/@types/config";
+
+export type inputFormatType =
+  | "XMLDocument"
   | "niconicome"
   | "formatted"
   | "legacy"
@@ -406,7 +427,7 @@ type inputFormatType =
   | "v1"
   | "empty"
   | "default";
-type inputFormat =
+export type inputFormat =
   | XMLDocument
   | formattedComment[]
   | formattedLegacyComment[]
@@ -416,8 +437,8 @@ type inputFormat =
   | string
   | undefined;
 type modeType = "default" | "html5" | "flash";
-type Options = {
-  config: ConfigNullable;
+type BaseOptions = {
+  config: Config;
   debug: boolean;
   enableLegacyPiP: boolean;
   format: inputFormatType;
@@ -431,8 +452,10 @@ type Options = {
   useLegacy: boolean;
   video: HTMLVideoElement | undefined;
 };
-type InitOptions = Partial<Options>;
+export type Options = Partial<BaseOptions>;
 
+import { IComment } from "@/@types/IComment";
+
 type formattedCommentWithFont = {
   id: number;
   vpos: number;
@@ -448,6 +471,7 @@ type formattedCommentWithFont = {
   fontSize: number;
   font: commentFont;
   color: string;
+  strokeColor?: string;
   full: boolean;
   ender: boolean;
   _live: boolean;
@@ -548,6 +572,7 @@ type parsedCommand = {
   size: commentSize | undefined;
   fontSize: number | undefined;
   color: string | undefined;
+  strokeColor?: string;
   font: commentFont | undefined;
   full: boolean;
   ender: boolean;
@@ -581,9 +606,13 @@ type measureInput = {
   lineCount: number;
 };
 
+import type { inputFormatType } from "@/@types/options";
+import type { formattedComment } from "@/@types/format.formatted";
 declare const convert2formattedComment: (data: unknown, type: inputFormatType) => formattedComment[];
 
 
+import type { inputFormat, Options } from "@/@types/options";
+import type { formattedComment } from "@/@types/format.formatted";
 declare class NiconiComments {
     enableLegacyPiP: boolean;
     showCollision: boolean;
@@ -595,7 +624,59 @@ declare class NiconiComments {
     private readonly collision;
     private readonly context;
     private readonly timeline;
-    constructor(canvas: HTMLCanvasElement, data: inputFormat, initOptions?: InitOptions);
+    static typeGuard: {
+        formatted: {
+            comment: (i: unknown) => i is formattedComment;
+            comments: (i: unknown) => i is formattedComment[];
+            legacyComment: (i: unknown) => i is import("@/@types/format.formatted").formattedLegacyComment;
+            legacyComments: (i: unknown) => i is import("@/@types/format.formatted").formattedLegacyComment[];
+        };
+        legacy: {
+            rawApiResponses: (i: unknown) => i is import("./@types/format.legacy").rawApiResponse[];
+            apiChat: (i: unknown) => i is import("./@types/format.legacy").apiChat;
+            apiGlobalNumRes: (i: unknown) => i is import("./@types/format.legacy").apiGlobalNumRes;
+            apiLeaf: (i: unknown) => i is import("./@types/format.legacy").apiLeaf;
+            apiPing: (i: unknown) => i is import("./@types/format.legacy").apiPing;
+            apiThread: (i: unknown) => i is import("./@types/format.legacy").apiThread;
+        };
+        xmlDocument: (i: unknown) => i is XMLDocument;
+        legacyOwner: {
+            comments: (i: unknown) => i is string;
+        };
+        owner: {
+            comment: (i: unknown) => i is import("./@types/format.owner").ownerComment;
+            comments: (i: unknown) => i is import("./@types/format.owner").ownerComment[];
+        };
+        v1: {
+            comment: (i: unknown) => i is import("./@types/format.v1").v1Comment;
+            thread: (i: unknown) => i is import("./@types/format.v1").v1Thread;
+            threads: (i: unknown) => i is import("./@types/format.v1").v1Thread[];
+        };
+        nicoScript: {
+            range: {
+                target: (i: unknown) => i is import("@/@types/types").nicoScriptReverseTarget;
+            };
+            replace: {
+                range: (i: unknown) => i is import("@/@types/types").nicoScriptReplaceRange;
+                target: (i: unknown) => i is import("@/@types/types").nicoScriptReplaceTarget;
+                condition: (i: unknown) => i is import("@/@types/types").nicoScriptReplaceCondition;
+            };
+        };
+        comment: {
+            font: (i: unknown) => i is import("@/@types/types").commentFont;
+            loc: (i: unknown) => i is import("@/@types/types").commentLoc;
+            size: (i: unknown) => i is import("@/@types/types").commentSize;
+            command: {
+                key: (i: unknown) => i is "full" | "ender" | "_live" | "invisible";
+            };
+            color: (i: unknown) => i is "white" | "red" | "pink" | "orange" | "yellow" | "green" | "cyan" | "blue" | "purple" | "black" | "white2" | "niconicowhite" | "red2" | "truered" | "pink2" | "orange2" | "passionorange" | "yellow2" | "madyellow" | "green2" | "elementalgreen" | "cyan2" | "blue2" | "marinblue" | "purple2" | "nobleviolet" | "black2";
+            colorCode: (i: unknown) => i is string;
+        };
+        config: {
+            initOptions: (item: unknown) => item is Partial<import("@/@types/options").BaseOptions>;
+        };
+    };
+    constructor(canvas: HTMLCanvasElement, data: inputFormat, initOptions?: Options);
     private preRendering;
     private getCommentPos;
     private sortComment;
@@ -605,6 +686,7 @@ declare class NiconiComments {
 }
 
 
+import type { commentSize, measureInput } from "@/@types/types";
 declare const getLineHeight: (fontSize: commentSize, isFlash: boolean, resized?: boolean) => number;
 declare const getCharSize: (fontSize: commentSize, isFlash: boolean) => number;
 declare const measure: (comment: measureInput, context: CanvasRenderingContext2D) => {
@@ -619,6 +701,11 @@ declare const getFontSizeAndScale: (charSize: number) => {
 };
 
 
+import type { formattedComment, formattedLegacyComment } from "@/@types/format.formatted";
+import type { apiChat, apiGlobalNumRes, apiLeaf, apiPing, apiThread, rawApiResponse } from "@/@types/format.legacy";
+import type { ownerComment } from "@/@types/format.owner";
+import type { v1Comment, v1Thread } from "@/@types/format.v1";
+import type { commentFont, commentLoc, commentSize, nicoScriptReplaceCondition, nicoScriptReplaceRange, nicoScriptReplaceTarget, nicoScriptReverseTarget } from "@/@types/types";
 declare const typeGuard: {
     formatted: {
         comment: (i: unknown) => i is formattedComment;
@@ -634,9 +721,7 @@ declare const typeGuard: {
         apiPing: (i: unknown) => i is apiPing;
         apiThread: (i: unknown) => i is apiThread;
     };
-    niconicome: {
-        xmlDocument: (i: unknown) => i is XMLDocument;
-    };
+    xmlDocument: (i: unknown) => i is XMLDocument;
     legacyOwner: {
         comments: (i: unknown) => i is string;
     };
@@ -666,13 +751,19 @@ declare const typeGuard: {
         command: {
             key: (i: unknown) => i is "full" | "ender" | "_live" | "invisible";
         };
+        color: (i: unknown) => i is "white" | "red" | "pink" | "orange" | "yellow" | "green" | "cyan" | "blue" | "purple" | "black" | "white2" | "niconicowhite" | "red2" | "truered" | "pink2" | "orange2" | "passionorange" | "yellow2" | "madyellow" | "green2" | "elementalgreen" | "cyan2" | "blue2" | "marinblue" | "purple2" | "nobleviolet" | "black2";
+        colorCode: (i: unknown) => i is string;
     };
     config: {
-        initOptions: (item: unknown) => item is Partial<Options>;
+        initOptions: (item: unknown) => item is Partial<import("@/@types/options").BaseOptions>;
     };
 };
 
 
+import type { configItem } from "@/@types/config";
+import type { IComment } from "@/@types/IComment";
+import type { commentFont, formattedCommentWithFont, formattedCommentWithSize } from "@/@types/types";
+import type { formattedComment } from "@/@types/format.formatted";
 declare const getPosY: (currentPos: number, targetComment: IComment, collision: IComment[] | undefined) => {
     currentPos: number;
     isChanged: boolean;
@@ -684,11 +775,13 @@ declare const arrayPush: (array: {
     [key: number]: IComment[];
 }, key: string | number, push: IComment) => void;
 declare const hex2rgb: (hex: string) => number[];
+declare const hex2rgba: (hex: string) => number[];
 declare const replaceAll: (string: string, target: string, replace: string) => string;
 declare const changeCALayer: (rawData: formattedComment[]) => formattedComment[];
 declare const getConfig: <T>(input: configItem<T>, isFlash?: boolean) => T;
 declare const isFlashComment: (comment: formattedComment) => boolean;
 declare const parseCommandAndNicoScript: (comment: formattedComment) => formattedCommentWithFont;
+declare const getStrokeColor: (comment: formattedCommentWithSize) => string;
 
 
 export default NiconiComments;

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.36
+  niconicomments.js v0.2.38
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -9,6 +9,36 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.NiconiComments = factory());
 })(this, (function () { 'use strict';
 
+    var colors = {
+        white: "#FFFFFF",
+        red: "#FF0000",
+        pink: "#FF8080",
+        orange: "#FFC000",
+        yellow: "#FFFF00",
+        green: "#00FF00",
+        cyan: "#00FFFF",
+        blue: "#0000FF",
+        purple: "#C000FF",
+        black: "#000000",
+        white2: "#CCCC99",
+        niconicowhite: "#CCCC99",
+        red2: "#CC0033",
+        truered: "#CC0033",
+        pink2: "#FF33CC",
+        orange2: "#FF6600",
+        passionorange: "#FF6600",
+        yellow2: "#999900",
+        madyellow: "#999900",
+        green2: "#00CC66",
+        elementalgreen: "#00CC66",
+        cyan2: "#00CCCC",
+        blue2: "#3399FF",
+        marinblue: "#3399FF",
+        purple2: "#6633CC",
+        nobleviolet: "#6633CC",
+        black2: "#666666",
+    };
+
     var isBoolean = function (i) { return typeof i === "boolean"; };
     var isNumber = function (i) { return typeof i === "number"; };
     var isObject = function (i) { return typeof i === "object"; };
@@ -101,47 +131,28 @@
                 ]);
             },
         },
-        niconicome: {
-            xmlDocument: function (i) {
-                if (!i.documentElement ||
-                    i.documentElement.nodeName !== "packet")
-                    return false;
-                if (!i.documentElement.children)
+        xmlDocument: function (i) {
+            if (!i.documentElement ||
+                i.documentElement.nodeName !== "packet")
+                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)
+                    continue;
+                if (value.nodeName === "chat" &&
+                    !typeAttributeVerify(value, [
+                        "no",
+                        "vpos",
+                        "date",
+                        "date_usec",
+                        "mail",
+                        "premium",
+                    ]))
                     return false;
-                for (var index = 0; index < i.documentElement.children.length; index++) {
-                    var value = i.documentElement.children[index];
-                    if (!value)
-                        continue;
-                    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",
-                                "mail",
-                                "leaf",
-                                "premium",
-                                "score",
-                            ]))
-                            return false;
-                    }
-                }
-                return true;
-            },
+            }
+            return true;
         },
         legacyOwner: {
             comments: function (i) {
@@ -214,19 +225,20 @@
         nicoScript: {
             range: {
                 target: function (i) {
-                    return typeof i === "string" && !!i.match(/^(?:コメ|投コメ|全)$/);
+                    return typeof i === "string" && !!i.match(/^(?:\u6295?\u30b3\u30e1|\u5168)$/);
                 },
             },
             replace: {
                 range: function (i) {
-                    return typeof i === "string" && !!i.match(/^(?:単|全)$/);
+                    return typeof i === "string" && !!i.match(/^(?:\u5358|\u5168)$/);
                 },
                 target: function (i) {
                     return typeof i === "string" &&
-                        !!i.match(/^(?:コメ|投コメ|全|含む|含まない)$/);
+                        !!i.match(/^(?:\u30b3\u30e1|\u6295\u30b3\u30e1|\u5168|\u542b\u3080|\u542b\u307e\u306a\u3044)$/);
                 },
                 condition: function (i) {
-                    return typeof i === "string" && !!i.match(/^(?:部分一致|完全一致)$/);
+                    return typeof i === "string" &&
+                        !!i.match(/^(?:\u90e8\u5206\u4e00\u81f4|\u5b8c\u5168\u4e00\u81f4)$/);
                 },
             },
         },
@@ -245,6 +257,13 @@
                     return typeof i === "string" && !!i.match(/^(?:full|ender|_live|invisible)$/);
                 },
             },
+            color: function (i) {
+                return typeof i === "string" && Object.keys(colors).includes(i);
+            },
+            colorCode: function (i) {
+                return typeof i === "string" &&
+                    !!i.match(/^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/);
+            },
         },
         config: {
             initOptions: function (item) {
@@ -307,8 +326,9 @@
         if (type === "empty" && data === undefined) {
             return [];
         }
-        else if (type === "niconicome" && typeGuard.niconicome.xmlDocument(data)) {
-            result = fromNiconicome(data);
+        else if ((type === "XMLDocument" || type === "niconicome") &&
+            typeGuard.xmlDocument(data)) {
+            result = fromXMLDocument(data);
         }
         else if (type === "formatted" && typeGuard.formatted.legacyComments(data)) {
             result = fromFormatted(data);
@@ -330,7 +350,7 @@
         }
         return sort(result);
     };
-    var fromNiconicome = function (data) {
+    var fromXMLDocument = function (data) {
         var _a;
         var data_ = [], userList = [];
         for (var _i = 0, _b = Array.from(data.documentElement.children); _i < _b.length; _i++) {
@@ -724,36 +744,6 @@
         },
     };
 
-    var colors = {
-        white: "#FFFFFF",
-        red: "#FF0000",
-        pink: "#FF8080",
-        orange: "#FFC000",
-        yellow: "#FFFF00",
-        green: "#00FF00",
-        cyan: "#00FFFF",
-        blue: "#0000FF",
-        purple: "#C000FF",
-        black: "#000000",
-        white2: "#CCCC99",
-        niconicowhite: "#CCCC99",
-        red2: "#CC0033",
-        truered: "#CC0033",
-        pink2: "#FF33CC",
-        orange2: "#FF6600",
-        passionorange: "#FF6600",
-        yellow2: "#999900",
-        madyellow: "#999900",
-        green2: "#00CC66",
-        elementalgreen: "#00CC66",
-        cyan2: "#00CCCC",
-        blue2: "#3399FF",
-        marinblue: "#3399FF",
-        purple2: "#6633CC",
-        nobleviolet: "#6633CC",
-        black2: "#666666",
-    };
-
     var defaultConfig;
     var initConfig = function () {
         var platform = (function (ua) {
@@ -1021,6 +1011,30 @@
             return parseInt(str, 16);
         });
     };
+    var hex2rgba = function (hex) {
+        if (hex.slice(0, 1) === "#")
+            hex = hex.slice(1);
+        if (hex.length === 4)
+            hex =
+                hex.slice(0, 1) +
+                    hex.slice(0, 1) +
+                    hex.slice(1, 2) +
+                    hex.slice(1, 2) +
+                    hex.slice(2, 3) +
+                    hex.slice(2, 3) +
+                    hex.slice(3, 4) +
+                    hex.slice(3, 4);
+        return [
+            hex.slice(0, 2),
+            hex.slice(2, 4),
+            hex.slice(4, 6),
+            hex.slice(4, 6),
+        ].map(function (str, index) {
+            if (index === 3)
+                return parseInt(str, 16) / 256;
+            return parseInt(str, 16);
+        });
+    };
     var replaceAll = function (string, target, replace) {
         while (string.indexOf(target) !== -1) {
             string = string.replace(target, replace);
@@ -1282,6 +1296,7 @@
             size: undefined,
             fontSize: undefined,
             color: undefined,
+            strokeColor: undefined,
             font: undefined,
             full: false,
             ender: false,
@@ -1292,10 +1307,19 @@
         for (var _i = 0, metadata_1 = metadata; _i < metadata_1.length; _i++) {
             var command = metadata_1[_i];
             command = command.toLowerCase();
-            var match = command.match(/^(?:@|\uff20)([0-9.]+)/);
-            if (match && match[1]) {
+            var match = void 0;
+            if ((match = command.match(/^(?:@|\uff20)([0-9.]+)/)) && match[1]) {
                 result.long = Number(match[1]);
             }
+            else if (result.strokeColor === undefined &&
+                (match = command.match(/^nico:stroke:(.+)$/))) {
+                if (typeGuard.comment.color(match[1])) {
+                    result.strokeColor = colors[match[1]];
+                }
+                else if (typeGuard.comment.colorCode(match[1])) {
+                    result.strokeColor = match[1].slice(1);
+                }
+            }
             else if (result.loc === undefined && typeGuard.comment.loc(command)) {
                 result.loc = command;
             }
@@ -1327,6 +1351,20 @@
             }
         }
         return result;
+    };
+    var getStrokeColor = function (comment) {
+        if (comment.strokeColor) {
+            var length_1 = comment.strokeColor.length;
+            if (length_1 === 3 || length_1 === 6) {
+                return "rgba(".concat(hex2rgb(comment.strokeColor).join(","), ",").concat(config.contextStrokeOpacity, ")");
+            }
+            else if (length_1 === 4 || length_1 === 8) {
+                return "rgba(".concat(hex2rgba(comment.strokeColor).join(","), ")");
+            }
+        }
+        return "rgba(".concat(hex2rgb(comment.color === "#000000"
+            ? config.contextStrokeInversionColor
+            : config.contextStrokeColor).join(","), ",").concat(config.contextStrokeOpacity, ")");
     };
 
     var getLineHeight = function (fontSize, isFlash, resized) {
@@ -1577,6 +1615,9 @@
                 item.width = itemWidth[i];
             }
             comment.fontSize = (comment.charSize || 0) * 0.8;
+            var charScale = getFontSizeAndScale(comment.charSize || 0);
+            if (charScale.scale < 1)
+                height *= 1.01;
             return {
                 width: width * scale,
                 height: height * scale,
@@ -1674,6 +1715,7 @@
                 this.context.strokeRect(posX, posY, this.comment.width, this.comment.height);
                 for (var i = 0; i < this.comment.lineCount; i++) {
                     var linePosY = (this.comment.lineHeight * (i + 1) +
+                        (this.comment.charSize - this.comment.lineHeight) / 2 +
                         this.comment.lineHeight * -0.16 +
                         (((_a = config.fonts[this.comment.font]) === null || _a === void 0 ? void 0 : _a.offset) ||
                             0)) *
@@ -1696,7 +1738,9 @@
             var _this = this;
             var _a;
             if (this.comment.invisible ||
-                (this.comment.lineCount === 1 && this.comment.width === 0))
+                (this.comment.lineCount === 1 && this.comment.width === 0) ||
+                this.comment.height - (this.comment.charSize - this.comment.lineHeight) <=
+                    0)
                 return null;
             var cacheKey = JSON.stringify(this.comment.content) +
                 "@@HTML5@@" +
@@ -1721,9 +1765,7 @@
             var context = image.getContext("2d");
             if (!context)
                 throw new Error("Fail to get CanvasRenderingContext2D");
-            context.strokeStyle = "rgba(".concat(hex2rgb(this.comment.color === "#000000"
-                ? config.contextStrokeInversionColor
-                : config.contextStrokeColor).join(","), ",").concat(config.contextStrokeOpacity, ")");
+            context.strokeStyle = getStrokeColor(this.comment);
             context.textAlign = "start";
             context.textBaseline = "alphabetic";
             context.lineWidth = config.contextLineWidth;
@@ -1747,6 +1789,7 @@
                     if (line === undefined)
                         continue;
                     var posY = (this.comment.lineHeight * (lineCount + 1 + paddingTop) +
+                        (this.comment.charSize - this.comment.lineHeight) / 2 +
                         this.comment.lineHeight * -0.16 +
                         (((_a = config.fonts[this.comment.font]) === null || _a === void 0 ? void 0 : _a.offset) ||
                             0)) /
@@ -2244,7 +2287,9 @@
         FlashComment.prototype.getTextImage = function () {
             var _this = this;
             if (this.comment.invisible ||
-                (this.comment.lineCount === 1 && this.comment.width === 0))
+                (this.comment.lineCount === 1 && this.comment.width === 0) ||
+                this.comment.height - (this.comment.charSize - this.comment.lineHeight) <=
+                    0)
                 return null;
             var cacheKey = JSON.stringify(this.comment.content) +
                 "@@FLASH@@" +
@@ -2266,9 +2311,7 @@
             var context = image.getContext("2d");
             if (!context)
                 throw new Error("Fail to get CanvasRenderingContext2D");
-            context.strokeStyle = "rgba(".concat(hex2rgb(this.comment.color === "#000000"
-                ? config.contextStrokeInversionColor
-                : config.contextStrokeColor).join(","), ",").concat(config.contextStrokeOpacity, ")");
+            context.strokeStyle = getStrokeColor(this.comment);
             context.textAlign = "start";
             context.textBaseline = "alphabetic";
             context.lineWidth = 4;
@@ -2700,6 +2743,7 @@
         NiconiComments.prototype.clear = function () {
             this.context.clearRect(0, 0, config.canvasWidth, config.canvasHeight);
         };
+        NiconiComments.typeGuard = typeGuard;
         return NiconiComments;
     }());
     var logger = function (msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.36",
+  "version": "0.2.38",
   "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",
@@ -59,6 +59,7 @@
     "prettier": "2.7.1",
     "rimraf": "^3.0.2",
     "rollup": "^3.3.0",
+    "tslib": "^2.4.1",
     "typedoc": "^0.23.21",
     "typedoc-plugin-missing-exports": "^1.0.0",
     "typescript": "^4.9.3"