@xpadev-net/niconicomments 0.2.68 → 0.2.69

package/dist/bundle.d.ts

@@ -961,41 +961,6 @@ export type DefaultCommand = {
 	font?: CommentFont;
 	loc?: CommentLoc;
 };
-export interface IRenderer {
-	readonly canvas: HTMLCanvasElement;
-	readonly video?: HTMLVideoElement;
-	destroy(): void;
-	drawVideo(enableLegacyPip: boolean): void;
-	getFont(): string;
-	getFillStyle(): string | CanvasGradient | CanvasPattern;
-	setScale(scale: number, arg1?: number): void;
-	fillRect(x: number, y: number, width: number, height: number): void;
-	strokeRect(x: number, y: number, width: number, height: number): void;
-	fillText(text: string, x: number, y: number): void;
-	strokeText(text: string, x: number, y: number): void;
-	quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-	clearRect(x: number, y: number, width: number, height: number): void;
-	setFont(font: string): void;
-	setFillStyle(color: string): void;
-	setStrokeStyle(color: string): void;
-	setLineWidth(width: number): void;
-	setGlobalAlpha(alpha: number): void;
-	setSize(width: number, height: number): void;
-	getSize(): {
-		width: number;
-		height: number;
-	};
-	measureText(text: string): TextMetrics;
-	beginPath(): void;
-	closePath(): void;
-	moveTo(x: number, y: number): void;
-	lineTo(x: number, y: number): void;
-	stroke(): void;
-	save(): void;
-	restore(): void;
-	getCanvas(): IRenderer;
-	drawImage(image: IRenderer, x: number, y: number, width?: number, height?: number): void;
-}
 declare class BaseComment implements IComment {
 	protected readonly renderer: IRenderer;
 	protected cacheKey: string;
@@ -1575,42 +1540,105 @@ export declare const ZV1Thread: ObjectSchema<{
 }>;
 export type V1Thread = Output<typeof ZV1Thread>;
 export type v1Thread = V1Thread;
-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[];
-	content: string;
-	image?: IRenderer | null;
-	draw: (vpos: number, showCollision: boolean, cursor?: Position) => void;
-	isHovered: (cursor?: Position, posX?: number, posY?: number) => boolean;
-}
-export interface InputParser {
-	key: string[];
-	parse: (input: unknown) => FormattedComment[];
-}
-export interface IPluginConstructor {
-	id: string;
-	new (Canvas: IRenderer, comments: IComment[]): IPlugin;
-}
-export interface IPlugin {
-	draw?: (vpos: number) => void;
-	addComments?: (comments: IComment[]) => void;
-	transformComments?: (comments: IComment[]) => IComment[];
-}
-export type IPluginList = {
-	instance: IPlugin;
-	canvas: IRenderer;
-}[];
-declare const ZXml2jsPacket: ObjectSchema<{
+export declare const ZXml2jsChatItem: ObjectSchema<{
+	_: StringSchema<string>;
+	$: ObjectSchema<{
+		no: OptionalSchema<StringSchema<string>, undefined, string | undefined>;
+		vpos: StringSchema<string>;
+		date: OptionalSchema<StringSchema<string>, "0", string>;
+		date_usec: OptionalSchema<StringSchema<string>, "0", string>;
+		user_id: OptionalSchema<StringSchema<string>, undefined, string | undefined>;
+		owner: OptionalSchema<StringSchema<string>, "", string>;
+		premium: OptionalSchema<StringSchema<string>, "", string>;
+		mail: OptionalSchema<StringSchema<string>, "", string>;
+	}, undefined, {
+		owner: string;
+		vpos: string;
+		date: string;
+		date_usec: string;
+		premium: string;
+		mail: string;
+		user_id?: string | undefined;
+		no?: string | undefined;
+	}>;
+}, undefined, {
+	_: string;
+	$: {
+		owner: string;
+		vpos: string;
+		date: string;
+		date_usec: string;
+		premium: string;
+		mail: string;
+		user_id?: string | undefined;
+		no?: string | undefined;
+	};
+}>;
+export type Xml2jsChatItem = Output<typeof ZXml2jsChatItem>;
+export declare const ZXml2jsChat: ObjectSchema<{
+	chat: ArraySchema<ObjectSchema<{
+		_: StringSchema<string>;
+		$: ObjectSchema<{
+			no: OptionalSchema<StringSchema<string>, undefined, string | undefined>;
+			vpos: StringSchema<string>;
+			date: OptionalSchema<StringSchema<string>, "0", string>;
+			date_usec: OptionalSchema<StringSchema<string>, "0", string>;
+			user_id: OptionalSchema<StringSchema<string>, undefined, string | undefined>;
+			owner: OptionalSchema<StringSchema<string>, "", string>;
+			premium: OptionalSchema<StringSchema<string>, "", string>;
+			mail: OptionalSchema<StringSchema<string>, "", string>;
+		}, undefined, {
+			owner: string;
+			vpos: string;
+			date: string;
+			date_usec: string;
+			premium: string;
+			mail: string;
+			user_id?: string | undefined;
+			no?: string | undefined;
+		}>;
+	}, undefined, {
+		_: string;
+		$: {
+			owner: string;
+			vpos: string;
+			date: string;
+			date_usec: string;
+			premium: string;
+			mail: string;
+			user_id?: string | undefined;
+			no?: string | undefined;
+		};
+	}>, {
+		_: string;
+		$: {
+			owner: string;
+			vpos: string;
+			date: string;
+			date_usec: string;
+			premium: string;
+			mail: string;
+			user_id?: string | undefined;
+			no?: string | undefined;
+		};
+	}[]>;
+}, undefined, {
+	chat: {
+		_: string;
+		$: {
+			owner: string;
+			vpos: string;
+			date: string;
+			date_usec: string;
+			premium: string;
+			mail: string;
+			user_id?: string | undefined;
+			no?: string | undefined;
+		};
+	}[];
+}>;
+export type Xml2jsChat = Output<typeof ZXml2jsChat>;
+export declare const ZXml2jsPacket: ObjectSchema<{
 	packet: ObjectSchema<{
 		chat: ArraySchema<ObjectSchema<{
 			_: StringSchema<string>;
@@ -1691,6 +1719,41 @@ declare const ZXml2jsPacket: ObjectSchema<{
 	};
 }>;
 export type Xml2jsPacket = Output<typeof ZXml2jsPacket>;
+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[];
+	content: string;
+	image?: IRenderer | null;
+	draw: (vpos: number, showCollision: boolean, cursor?: Position) => void;
+	isHovered: (cursor?: Position, posX?: number, posY?: number) => boolean;
+}
+export interface InputParser {
+	key: string[];
+	parse: (input: unknown) => FormattedComment[];
+}
+export interface IPluginConstructor {
+	id: string;
+	new (Canvas: IRenderer, comments: IComment[]): IPlugin;
+}
+export interface IPlugin {
+	draw?: (vpos: number) => void;
+	addComments?: (comments: IComment[]) => void;
+	transformComments?: (comments: IComment[]) => IComment[];
+}
+export type IPluginList = {
+	instance: IPlugin;
+	canvas: IRenderer;
+}[];
 export declare const ZInputFormatType: UnionSchema<(LiteralSchema<"XMLDocument", "XMLDocument"> | LiteralSchema<"niconicome", "niconicome"> | LiteralSchema<"xml2js", "xml2js"> | LiteralSchema<"formatted", "formatted"> | LiteralSchema<"legacy", "legacy"> | LiteralSchema<"legacyOwner", "legacyOwner"> | LiteralSchema<"owner", "owner"> | LiteralSchema<"v1", "v1"> | LiteralSchema<"empty", "empty"> | LiteralSchema<"default", "default">)[], "default" | "XMLDocument" | "niconicome" | "xml2js" | "formatted" | "legacy" | "legacyOwner" | "owner" | "v1" | "empty">;
 export type InputFormatType = Output<typeof ZInputFormatType>;
 export type InputFormat = XMLDocument | Xml2jsPacket | FormattedComment[] | FormattedLegacyComment[] | RawApiResponse[] | OwnerComment[] | V1Thread[] | string | undefined;
@@ -1713,6 +1776,41 @@ export type BaseOptions = {
 export type Options = Partial<BaseOptions>;
 export type inputFormatType = InputFormatType;
 export type inputFormat = InputFormat;
+export interface IRenderer {
+	readonly canvas: HTMLCanvasElement;
+	readonly video?: HTMLVideoElement;
+	destroy(): void;
+	drawVideo(enableLegacyPip: boolean): void;
+	getFont(): string;
+	getFillStyle(): string | CanvasGradient | CanvasPattern;
+	setScale(scale: number, arg1?: number): void;
+	fillRect(x: number, y: number, width: number, height: number): void;
+	strokeRect(x: number, y: number, width: number, height: number): void;
+	fillText(text: string, x: number, y: number): void;
+	strokeText(text: string, x: number, y: number): void;
+	quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+	clearRect(x: number, y: number, width: number, height: number): void;
+	setFont(font: string): void;
+	setFillStyle(color: string): void;
+	setStrokeStyle(color: string): void;
+	setLineWidth(width: number): void;
+	setGlobalAlpha(alpha: number): void;
+	setSize(width: number, height: number): void;
+	getSize(): {
+		width: number;
+		height: number;
+	};
+	measureText(text: string): TextMetrics;
+	beginPath(): void;
+	closePath(): void;
+	moveTo(x: number, y: number): void;
+	lineTo(x: number, y: number): void;
+	stroke(): void;
+	save(): void;
+	restore(): void;
+	getCanvas(): IRenderer;
+	drawImage(image: IRenderer, x: number, y: number, width?: number, height?: number): void;
+}
 export type FormattedCommentWithFont = {
 	id: number;
 	vpos: number;
@@ -2615,6 +2713,53 @@ declare const typeGuard: {
 		};
 	};
 	xmlDocument: (i: unknown) => i is XMLDocument;
+	xml2js: {
+		packet: (i: unknown) => i is {
+			packet: {
+				chat: {
+					_: string;
+					$: {
+						owner: string;
+						vpos: string;
+						date: string;
+						date_usec: string;
+						premium: string;
+						mail: string;
+						user_id?: string | undefined;
+						no?: string | undefined;
+					};
+				}[];
+			};
+		};
+		chat: (i: unknown) => i is {
+			chat: {
+				_: string;
+				$: {
+					owner: string;
+					vpos: string;
+					date: string;
+					date_usec: string;
+					premium: string;
+					mail: string;
+					user_id?: string | undefined;
+					no?: string | undefined;
+				};
+			}[];
+		};
+		chatItem: (i: unknown) => i is {
+			_: string;
+			$: {
+				owner: string;
+				vpos: string;
+				date: string;
+				date_usec: string;
+				premium: string;
+				mail: string;
+				user_id?: string | undefined;
+				no?: string | undefined;
+			};
+		};
+	};
 	legacyOwner: {
 		comments: (i: unknown) => i is string;
 	};
@@ -3013,6 +3158,53 @@ declare class NiconiComments {
 			};
 		};
 		xmlDocument: (i: unknown) => i is XMLDocument;
+		xml2js: {
+			packet: (i: unknown) => i is {
+				packet: {
+					chat: {
+						_: string;
+						$: {
+							owner: string;
+							vpos: string;
+							date: string;
+							date_usec: string;
+							premium: string;
+							mail: string;
+							user_id?: string | undefined;
+							no?: string | undefined;
+						};
+					}[];
+				};
+			};
+			chat: (i: unknown) => i is {
+				chat: {
+					_: string;
+					$: {
+						owner: string;
+						vpos: string;
+						date: string;
+						date_usec: string;
+						premium: string;
+						mail: string;
+						user_id?: string | undefined;
+						no?: string | undefined;
+					};
+				}[];
+			};
+			chatItem: (i: unknown) => i is {
+				_: string;
+				$: {
+					owner: string;
+					vpos: string;
+					date: string;
+					date_usec: string;
+					premium: string;
+					mail: string;
+					user_id?: string | undefined;
+					no?: string | undefined;
+				};
+			};
+		};
 		legacyOwner: {
 			comments: (i: unknown) => i is string;
 		};

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.68
+  niconicomments.js v0.2.69
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -1509,6 +1509,26 @@
         comments: array(ZV1Comment),
     });
 
+    const ZXml2jsChatItem = object({
+        _: string(),
+        $: object({
+            no: optional(string()),
+            vpos: string(),
+            date: optional(string(), "0"),
+            date_usec: optional(string(), "0"),
+            user_id: optional(string()),
+            owner: optional(string(), ""),
+            premium: optional(string(), ""),
+            mail: optional(string(), ""),
+        }),
+    });
+    const ZXml2jsChat = object({
+        chat: array(ZXml2jsChatItem),
+    });
+    const ZXml2jsPacket = object({
+        packet: ZXml2jsChat,
+    });
+
     const ZInputFormatType = union([
         literal("XMLDocument"),
         literal("niconicome"),
@@ -1674,6 +1694,11 @@
             }
             return true;
         },
+        xml2js: {
+            packet: (i) => is(ZXml2jsPacket, i),
+            chat: (i) => is(ZXml2jsChat, i),
+            chatItem: (i) => is(ZXml2jsChatItem, i),
+        },
         legacyOwner: {
             comments: (i) => is(string([
                 custom((i) => {
@@ -4360,26 +4385,6 @@
     };
     const date2time = (date) => Math.floor(Date.parse(date) / 1000);
 
-    const ZXml2jsChatItem = object({
-        _: string(),
-        $: object({
-            no: optional(string()),
-            vpos: string(),
-            date: optional(string(), "0"),
-            date_usec: optional(string(), "0"),
-            user_id: optional(string()),
-            owner: optional(string(), ""),
-            premium: optional(string(), ""),
-            mail: optional(string(), ""),
-        }),
-    });
-    const ZXml2jsChat = object({
-        chat: array(ZXml2jsChatItem),
-    });
-    const ZXml2jsPacket = object({
-        packet: ZXml2jsChat,
-    });
-
     const Xml2jsParser = {
         key: ["xml2js"],
         parse: (input) => {

package/package.json

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