@xpadev-net/niconicomments 0.2.62 → 0.2.63

package/dist/bundle.d.ts

@@ -41,6 +41,7 @@ type DefaultCommand = {
 interface IRenderer {
     readonly canvas: HTMLCanvasElement;
     readonly video?: HTMLVideoElement;
+    destroy(): void;
     drawVideo(enableLegacyPip: boolean): void;
     getFont(): string;
     getFillStyle(): string | CanvasGradient | CanvasPattern;
@@ -385,9 +386,9 @@ declare const ZFormattedComment: valibot.ObjectSchema<{
 }, undefined, {
     owner: boolean;
     content: string;
+    id: number;
     vpos: number;
     date: number;
-    id: number;
     date_usec: number;
     premium: boolean;
     mail: string[];
@@ -411,9 +412,9 @@ declare const ZFormattedLegacyComment: valibot.ObjectSchema<Omit<{
 }, "user_id" | "layer" | "is_my_post">, undefined, {
     owner: boolean;
     content: string;
+    id: number;
     vpos: number;
     date: number;
-    id: number;
     date_usec: number;
     premium: boolean;
     mail: string[];
@@ -1524,6 +1525,7 @@ declare class CanvasRenderer implements IRenderer {
     save(): void;
     restore(): void;
     getCanvas(): IRenderer;
+    destroy(): void;
 }
 
 type index_d$1_CanvasRenderer = CanvasRenderer;
@@ -1533,10 +1535,194 @@ declare namespace index_d$1 {
 }
 
 declare const typeGuard: {
+    formatted: {
+        comment: (i: unknown) => i is {
+            owner: boolean;
+            content: string;
+            id: number;
+            vpos: number;
+            date: number;
+            date_usec: number;
+            premium: boolean;
+            mail: string[];
+            user_id: number;
+            layer: number;
+            is_my_post: boolean;
+        };
+        comments: (i: unknown) => i is {
+            owner: boolean;
+            content: string;
+            id: number;
+            vpos: number;
+            date: number;
+            date_usec: number;
+            premium: boolean;
+            mail: string[];
+            user_id: number;
+            layer: number;
+            is_my_post: boolean;
+        }[];
+        legacyComment: (i: unknown) => i is {
+            owner: boolean;
+            content: string;
+            id: number;
+            vpos: number;
+            date: number;
+            date_usec: number;
+            premium: boolean;
+            mail: string[];
+        };
+        legacyComments: (i: unknown) => i is {
+            owner: boolean;
+            content: string;
+            id: number;
+            vpos: number;
+            date: number;
+            date_usec: number;
+            premium: boolean;
+            mail: string[];
+        }[];
+    };
+    legacy: {
+        rawApiResponses: (i: unknown) => i is ({
+            chat: {
+                content: string;
+                vpos: number;
+                date: number;
+                date_usec: number;
+                premium: number;
+                mail: string;
+                user_id: string;
+                thread: string;
+                no: number;
+                nicoru: number;
+                anonymity: number;
+                deleted: number;
+            };
+        } | {
+            [x: string]: unknown;
+        })[];
+        apiChat: (i: unknown) => i is {
+            content: string;
+            vpos: number;
+            date: number;
+            date_usec: number;
+            premium: number;
+            mail: string;
+            user_id: string;
+            thread: string;
+            no: number;
+            nicoru: number;
+            anonymity: number;
+            deleted: number;
+        };
+        apiGlobalNumRes: (i: unknown) => i is {
+            thread: string;
+            num_res: number;
+        };
+        apiLeaf: (i: unknown) => i is {
+            count: number;
+            thread: string;
+        };
+        apiPing: (i: unknown) => i is {
+            content: string;
+        };
+        apiThread: (i: unknown) => i is {
+            thread: string;
+            resultcode: number;
+            server_time: number;
+            ticket: string;
+            revision: number;
+        };
+    };
     xmlDocument: (i: unknown) => i is XMLDocument;
     legacyOwner: {
         comments: (i: unknown) => i is string;
     };
+    owner: {
+        comment: (i: unknown) => i is {
+            time: string;
+            command: string;
+            comment: string;
+        };
+        comments: (i: unknown) => i is {
+            time: string;
+            command: string;
+            comment: string;
+        }[];
+    };
+    v1: {
+        comment: (i: unknown) => i is {
+            id: string;
+            no: number;
+            vposMs: number;
+            body: string;
+            commands: string[];
+            userId: string;
+            isPremium: boolean;
+            score: number;
+            postedAt: string;
+            nicoruCount: number;
+            nicoruId: string | null;
+            source: string;
+            isMyPost: boolean;
+        };
+        comments: (i: unknown) => i is {
+            id: string;
+            no: number;
+            vposMs: number;
+            body: string;
+            commands: string[];
+            userId: string;
+            isPremium: boolean;
+            score: number;
+            postedAt: string;
+            nicoruCount: number;
+            nicoruId: string | null;
+            source: string;
+            isMyPost: boolean;
+        }[];
+        thread: (i: unknown) => i is {
+            fork: string;
+            commentCount: number;
+            comments: {
+                id: string;
+                no: number;
+                vposMs: number;
+                body: string;
+                commands: string[];
+                userId: string;
+                isPremium: boolean;
+                score: number;
+                postedAt: string;
+                nicoruCount: number;
+                nicoruId: string | null;
+                source: string;
+                isMyPost: boolean;
+            }[];
+            id?: unknown;
+        };
+        threads: (i: unknown) => i is {
+            fork: string;
+            commentCount: number;
+            comments: {
+                id: string;
+                no: number;
+                vposMs: number;
+                body: string;
+                commands: string[];
+                userId: string;
+                isPremium: boolean;
+                score: number;
+                postedAt: string;
+                nicoruCount: number;
+                nicoruId: string | null;
+                source: string;
+                isMyPost: boolean;
+            }[];
+            id?: unknown;
+        }[];
+    };
     nicoScript: {
         range: {
             target: (i: unknown) => i is NicoScriptReverseTarget;
@@ -1548,16 +1734,44 @@ declare const typeGuard: {
         };
     };
     comment: {
+        font: (i: unknown) => i is "defont" | "mincho" | "gothic" | "gulim" | "simsun";
+        loc: (i: unknown) => i is "ue" | "naka" | "shita";
+        size: (i: unknown) => i is "big" | "medium" | "small";
         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;
         colorCodeAllowAlpha: (i: unknown) => i is string;
     };
     config: {
         initOptions: (item: unknown) => item is Partial<BaseOptions>;
     };
     internal: {
+        CommentMeasuredContentItem: (i: unknown) => i is {
+            type: "spacer";
+            char: string;
+            charWidth: number;
+            count: number;
+            isButton?: boolean | undefined;
+            font?: "defont" | "gulim" | "simsun" | undefined;
+        } | (({
+            type: "spacer";
+            char: string;
+            charWidth: number;
+            count: number;
+            isButton?: boolean | undefined;
+            font?: "defont" | "gulim" | "simsun" | undefined;
+        } | {
+            type: "text";
+            content: string;
+            slicedContent: string[];
+            isButton?: boolean | undefined;
+            font?: "defont" | "gulim" | "simsun" | undefined;
+            width?: number[] | undefined;
+        }) & {
+            width: number[];
+        });
         CommentMeasuredContentItemArray: (i: unknown) => i is ({
             type: "spacer";
             char: string;
@@ -1732,10 +1946,194 @@ declare class NiconiComments {
     private readonly collision;
     private readonly timeline;
     static typeGuard: {
+        formatted: {
+            comment: (i: unknown) => i is {
+                owner: boolean;
+                content: string;
+                id: number;
+                vpos: number;
+                date: number;
+                date_usec: number;
+                premium: boolean;
+                mail: string[];
+                user_id: number;
+                layer: number;
+                is_my_post: boolean;
+            };
+            comments: (i: unknown) => i is {
+                owner: boolean;
+                content: string;
+                id: number;
+                vpos: number;
+                date: number;
+                date_usec: number;
+                premium: boolean;
+                mail: string[];
+                user_id: number;
+                layer: number;
+                is_my_post: boolean;
+            }[];
+            legacyComment: (i: unknown) => i is {
+                owner: boolean;
+                content: string;
+                id: number;
+                vpos: number;
+                date: number;
+                date_usec: number;
+                premium: boolean;
+                mail: string[];
+            };
+            legacyComments: (i: unknown) => i is {
+                owner: boolean;
+                content: string;
+                id: number;
+                vpos: number;
+                date: number;
+                date_usec: number;
+                premium: boolean;
+                mail: string[];
+            }[];
+        };
+        legacy: {
+            rawApiResponses: (i: unknown) => i is ({
+                chat: {
+                    content: string;
+                    vpos: number;
+                    date: number;
+                    date_usec: number;
+                    premium: number;
+                    mail: string;
+                    user_id: string;
+                    thread: string;
+                    no: number;
+                    nicoru: number;
+                    anonymity: number;
+                    deleted: number;
+                };
+            } | {
+                [x: string]: unknown;
+            })[];
+            apiChat: (i: unknown) => i is {
+                content: string;
+                vpos: number;
+                date: number;
+                date_usec: number;
+                premium: number;
+                mail: string;
+                user_id: string;
+                thread: string;
+                no: number;
+                nicoru: number;
+                anonymity: number;
+                deleted: number;
+            };
+            apiGlobalNumRes: (i: unknown) => i is {
+                thread: string;
+                num_res: number;
+            };
+            apiLeaf: (i: unknown) => i is {
+                count: number;
+                thread: string;
+            };
+            apiPing: (i: unknown) => i is {
+                content: string;
+            };
+            apiThread: (i: unknown) => i is {
+                thread: string;
+                resultcode: number;
+                server_time: number;
+                ticket: string;
+                revision: number;
+            };
+        };
         xmlDocument: (i: unknown) => i is XMLDocument;
         legacyOwner: {
             comments: (i: unknown) => i is string;
         };
+        owner: {
+            comment: (i: unknown) => i is {
+                time: string;
+                command: string;
+                comment: string;
+            };
+            comments: (i: unknown) => i is {
+                time: string;
+                command: string;
+                comment: string;
+            }[];
+        };
+        v1: {
+            comment: (i: unknown) => i is {
+                id: string;
+                no: number;
+                vposMs: number;
+                body: string;
+                commands: string[];
+                userId: string;
+                isPremium: boolean;
+                score: number;
+                postedAt: string;
+                nicoruCount: number;
+                nicoruId: string | null;
+                source: string;
+                isMyPost: boolean;
+            };
+            comments: (i: unknown) => i is {
+                id: string;
+                no: number;
+                vposMs: number;
+                body: string;
+                commands: string[];
+                userId: string;
+                isPremium: boolean;
+                score: number;
+                postedAt: string;
+                nicoruCount: number;
+                nicoruId: string | null;
+                source: string;
+                isMyPost: boolean;
+            }[];
+            thread: (i: unknown) => i is {
+                fork: string;
+                commentCount: number;
+                comments: {
+                    id: string;
+                    no: number;
+                    vposMs: number;
+                    body: string;
+                    commands: string[];
+                    userId: string;
+                    isPremium: boolean;
+                    score: number;
+                    postedAt: string;
+                    nicoruCount: number;
+                    nicoruId: string | null;
+                    source: string;
+                    isMyPost: boolean;
+                }[];
+                id?: unknown;
+            };
+            threads: (i: unknown) => i is {
+                fork: string;
+                commentCount: number;
+                comments: {
+                    id: string;
+                    no: number;
+                    vposMs: number;
+                    body: string;
+                    commands: string[];
+                    userId: string;
+                    isPremium: boolean;
+                    score: number;
+                    postedAt: string;
+                    nicoruCount: number;
+                    nicoruId: string | null;
+                    source: string;
+                    isMyPost: boolean;
+                }[];
+                id?: unknown;
+            }[];
+        };
         nicoScript: {
             range: {
                 target: (i: unknown) => i is NicoScriptReverseTarget;
@@ -1747,16 +2145,44 @@ declare class NiconiComments {
             };
         };
         comment: {
+            font: (i: unknown) => i is "defont" | "mincho" | "gothic" | "gulim" | "simsun";
+            loc: (i: unknown) => i is "ue" | "naka" | "shita";
+            size: (i: unknown) => i is "big" | "medium" | "small";
             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;
             colorCodeAllowAlpha: (i: unknown) => i is string;
         };
         config: {
             initOptions: (item: unknown) => item is Partial<BaseOptions>;
         };
         internal: {
+            CommentMeasuredContentItem: (i: unknown) => i is {
+                type: "spacer";
+                char: string;
+                charWidth: number;
+                count: number;
+                isButton?: boolean | undefined;
+                font?: "defont" | "gulim" | "simsun" | undefined;
+            } | (({
+                type: "spacer";
+                char: string;
+                charWidth: number;
+                count: number;
+                isButton?: boolean | undefined;
+                font?: "defont" | "gulim" | "simsun" | undefined;
+            } | {
+                type: "text";
+                content: string;
+                slicedContent: string[];
+                isButton?: boolean | undefined;
+                font?: "defont" | "gulim" | "simsun" | undefined;
+                width?: number[] | undefined;
+            }) & {
+                width: number[];
+            });
             CommentMeasuredContentItemArray: (i: unknown) => i is ({
                 type: "spacer";
                 char: string;
@@ -1811,9 +2237,9 @@ declare class NiconiComments {
         condition: (comment: {
             owner: boolean;
             content: string;
+            id: number;
             vpos: number;
             date: number;
-            id: number;
             date_usec: number;
             premium: boolean;
             mail: string[];
@@ -1841,4 +2267,4 @@ declare class NiconiComments {
     click(vpos: number, pos: Position): void;
 }
 
-export { type ApiChat, type ApiGlobalNumRes, type ApiLeaf, type ApiPing, type ApiThread, type BaseConfig, type BaseOptions, type ButtonList, type ButtonParams, type ButtonPartLeft, type ButtonPartMiddle, type ButtonPartRight, type Canvas, type Collision, type CollisionItem, type CollisionPos, type CommentContentIndex, type CommentContentItem, type CommentContentItemText, type CommentDisableEvent, type CommentDisableEventHandler, type CommentEnableEvent, type CommentEnableEventHandler, type CommentEventBase, type CommentEventHandler, type CommentEventHandlerMap, type CommentEventMap, type CommentEventName, type CommentFlashFont, type CommentFlashFontParsed, type CommentFont, type CommentHTML5Font, type CommentLoc, type CommentMeasuredContentItem, type CommentSize, type CommentStageSize, type Config, type ConfigItem, type Context2D, type DefaultCommand, type FlashMode, type FlashScriptChar, type FontItem, type FormattedComment, type FormattedCommentWithFont, type FormattedCommentWithSize, type FormattedLegacyComment, type HTML5Fonts, type IComment, type IPlugin, type IPluginConstructor, type IPluginList, type InputFormat, type InputFormatType, type JumpEvent, type JumpEventHandler, type MeasureInput, type MeasureTextInput, type MeasureTextResult, type MultiConfigItem, type NicoScript, type NicoScriptReplace, type NicoScriptReplaceCondition, type NicoScriptReplaceRange, type NicoScriptReplaceTarget, type NicoScriptReverseTarget, type Options, type OwnerComment, type ParseCommandAndNicoScriptResult, type ParseContentResult, type ParsedCommand, type Platform, type PlatformFont, type Position, type RawApiResponse, type SeekDisableEvent, type SeekDisableEventHandler, type SeekEnableEvent, type SeekEnableEventHandler, type Timeline, type V1Comment, type V1Thread, type ValueOf, ZApiChat, ZApiGlobalNumRes, ZApiLeaf, ZApiPing, ZApiThread, ZCommentContentItem, ZCommentContentItemSpacer, ZCommentContentItemText, ZCommentFlashFont, ZCommentFont, ZCommentHTML5Font, ZCommentLoc, ZCommentMeasuredContentItem, ZCommentMeasuredContentItemText, ZCommentSize, ZFormattedComment, ZFormattedLegacyComment, ZHTML5Fonts, ZMeasureInput, ZOwnerComment, ZRawApiResponse, ZV1Comment, ZV1Thread, NiconiComments as default, type formattedComment, type formattedLegacyComment, type inputFormat, type inputFormatType, type ownerComment, type rawApiResponse, type v1Thread };
+export { type ApiChat, type ApiGlobalNumRes, type ApiLeaf, type ApiPing, type ApiThread, type BaseConfig, type BaseOptions, type ButtonList, type ButtonParams, type ButtonPartLeft, type ButtonPartMiddle, type ButtonPartRight, type Canvas, type Collision, type CollisionItem, type CollisionPos, type CommentContentIndex, type CommentContentItem, type CommentContentItemText, type CommentDisableEvent, type CommentDisableEventHandler, type CommentEnableEvent, type CommentEnableEventHandler, type CommentEventBase, type CommentEventHandler, type CommentEventHandlerMap, type CommentEventMap, type CommentEventName, type CommentFlashFont, type CommentFlashFontParsed, type CommentFont, type CommentHTML5Font, type CommentLoc, type CommentMeasuredContentItem, type CommentSize, type CommentStageSize, type Config, type ConfigItem, type Context2D, type DefaultCommand, type FlashMode, type FlashScriptChar, type FontItem, type FormattedComment, type FormattedCommentWithFont, type FormattedCommentWithSize, type FormattedLegacyComment, type HTML5Fonts, type IComment, type IPlugin, type IPluginConstructor, type IPluginList, type IRenderer, type InputFormat, type InputFormatType, type JumpEvent, type JumpEventHandler, type MeasureInput, type MeasureTextInput, type MeasureTextResult, type MultiConfigItem, type NicoScript, type NicoScriptReplace, type NicoScriptReplaceCondition, type NicoScriptReplaceRange, type NicoScriptReplaceTarget, type NicoScriptReverseTarget, type Options, type OwnerComment, type ParseCommandAndNicoScriptResult, type ParseContentResult, type ParsedCommand, type Platform, type PlatformFont, type Position, type RawApiResponse, type SeekDisableEvent, type SeekDisableEventHandler, type SeekEnableEvent, type SeekEnableEventHandler, type Timeline, type V1Comment, type V1Thread, type ValueOf, ZApiChat, ZApiGlobalNumRes, ZApiLeaf, ZApiPing, ZApiThread, ZCommentContentItem, ZCommentContentItemSpacer, ZCommentContentItemText, ZCommentFlashFont, ZCommentFont, ZCommentHTML5Font, ZCommentLoc, ZCommentMeasuredContentItem, ZCommentMeasuredContentItemText, ZCommentSize, ZFormattedComment, ZFormattedLegacyComment, ZHTML5Fonts, ZMeasureInput, ZOwnerComment, ZRawApiResponse, ZV1Comment, ZV1Thread, NiconiComments as default, type formattedComment, type formattedLegacyComment, type inputFormat, type inputFormatType, type ownerComment, type rawApiResponse, type v1Thread };

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.62
+  niconicomments.js v0.2.63
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -1518,7 +1518,7 @@
         layer: optional(number(), -1),
         is_my_post: optional(_boolean(), false),
     });
-    omit(ZFormattedComment, [
+    const ZFormattedLegacyComment = omit(ZFormattedComment, [
         "layer",
         "user_id",
         "is_my_post",
@@ -1542,21 +1542,21 @@
         object({ chat: ZApiChat }),
         record(string([notValue("chat")]), unknown()),
     ]);
-    object({
+    const ZApiPing = object({
         content: string(),
     });
-    object({
+    const ZApiThread = object({
         resultcode: number(),
         thread: string(),
         server_time: number(),
         ticket: string(),
         revision: number(),
     });
-    object({
+    const ZApiLeaf = object({
         thread: string(),
         count: number(),
     });
-    object({
+    const ZApiGlobalNumRes = object({
         thread: string(),
         num_res: number(),
     });
@@ -1688,6 +1688,20 @@
     const isNumber = (i) => typeof i === "number";
     const isObject = (i) => typeof i === "object";
     const typeGuard = {
+        formatted: {
+            comment: (i) => is(ZFormattedComment, i),
+            comments: (i) => is(array(ZFormattedComment), i),
+            legacyComment: (i) => is(ZFormattedLegacyComment, i),
+            legacyComments: (i) => is(array(ZFormattedLegacyComment), i),
+        },
+        legacy: {
+            rawApiResponses: (i) => is(array(ZRawApiResponse), i),
+            apiChat: (i) => is(ZApiChat, i),
+            apiGlobalNumRes: (i) => is(ZApiGlobalNumRes, i),
+            apiLeaf: (i) => is(ZApiLeaf, i),
+            apiPing: (i) => is(ZApiPing, i),
+            apiThread: (i) => is(ZApiThread, i),
+        },
         xmlDocument: (i) => {
             if (!i.documentElement ||
                 i.documentElement.nodeName !== "packet")
@@ -1715,6 +1729,16 @@
                 }),
             ]), i),
         },
+        owner: {
+            comment: (i) => is(ZOwnerComment, i),
+            comments: (i) => is(array(ZOwnerComment), i),
+        },
+        v1: {
+            comment: (i) => is(ZV1Comment, i),
+            comments: (i) => is(array(ZV1Comment), i),
+            thread: (i) => is(ZV1Thread, i),
+            threads: (i) => is(array(ZV1Thread), i),
+        },
         nicoScript: {
             range: {
                 target: (i) => is(string([regex(/^(?:\u6295?\u30b3\u30e1|\u5168)$/)]), i),
@@ -1730,6 +1754,9 @@
             },
         },
         comment: {
+            font: (i) => is(ZCommentFont, i),
+            loc: (i) => is(ZCommentLoc, i),
+            size: (i) => is(ZCommentSize, i),
             command: {
                 key: (i) => is(union([
                     literal("full"),
@@ -1739,6 +1766,7 @@
                 ]), i),
             },
             color: (i) => is(string([custom((i) => Object.keys(colors).includes(i))]), i),
+            colorCode: (i) => is(string([regex(/^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6})$/)]), i),
             colorCodeAllowAlpha: (i) => is(string([
                 regex(/^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/),
             ]), i),
@@ -1774,6 +1802,7 @@
             },
         },
         internal: {
+            CommentMeasuredContentItem: (i) => is(ZCommentMeasuredContentItem, i),
             CommentMeasuredContentItemArray: (i) => is(array(ZCommentMeasuredContentItem), i),
             MultiConfigItem: (i) => typeof i === "object" && objectVerify(i, ["html5", "flash"]),
             HTML5Fonts: (i) => is(ZHTML5Fonts, i),
@@ -2980,6 +3009,7 @@
                 }, this.comment.long * 10 + config.cacheAge);
                 clearTimeout(cache.timeout);
                 cache.timeout = setTimeout(() => {
+                    imageCache[this.cacheKey]?.image.destroy();
                     delete imageCache[this.cacheKey];
                 }, this.comment.long * 10 + config.cacheAge);
                 return cache.image;
@@ -4549,6 +4579,8 @@
         getCanvas() {
             return new CanvasRenderer();
         }
+        destroy() {
+        }
     }
 
     var index = /*#__PURE__*/Object.freeze({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.62",
+  "version": "0.2.63",
   "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",