Merge pull request #91 from xpadev-net/fix/typeguard

[修正] xml2jsの型ガードを公開・型のインポートを修正

src/@types/IComment.ts

@@ -1,5 +1,9 @@
-import type { CommentLoc, FormattedCommentWithSize, Position } from "@/@types/";
-import type { IRenderer } from "@/@types/renderer";
+import type {
+  CommentLoc,
+  FormattedCommentWithSize,
+  IRenderer,
+  Position,
+} from "@/@types/";
 
 export interface IComment {
   comment: FormattedCommentWithSize;

src/@types/IPlugins.ts

@@ -1,5 +1,4 @@
-import type { IComment } from "@/@types/";
-import type { IRenderer } from "@/@types/renderer";
+import type { IComment, IRenderer } from "@/@types/";
 
 export interface IPluginConstructor {
   id: string;

src/@types/index.ts

@@ -9,6 +9,7 @@ export * from "./format.formatted";
 export * from "./format.legacy";
 export * from "./format.owner";
 export * from "./format.v1";
+export * from "./format.xml2js";
 export * from "./IComment";
 export * from "./input-parser";
 export * from "./IPlugins";

src/@types/input-parser.ts

@@ -1,4 +1,4 @@
-import type { FormattedComment } from "@/@types/format.formatted";
+import type { FormattedComment } from "@/@types/";
 
 export interface InputParser {
   key: string[];

src/@types/options.ts

@@ -8,8 +8,8 @@ import type {
   OwnerComment,
   RawApiResponse,
   V1Thread,
+  Xml2jsPacket,
 } from "@/@types/";
-import type { Xml2jsPacket } from "@/@types/format.xml2js";
 
 export const ZInputFormatType = union([
   literal("XMLDocument"),

src/comments/BaseComment.ts

@@ -3,12 +3,12 @@ import type {
   FormattedCommentWithFont,
   FormattedCommentWithSize,
   IComment,
+  IRenderer,
   MeasureTextInput,
   MeasureTextResult,
   ParseContentResult,
   Position,
 } from "@/@types/";
-import type { IRenderer } from "@/@types/renderer";
 import { imageCache } from "@/contexts";
 import { isDebug } from "@/contexts/debug";
 import { config } from "@/definition/config";

src/comments/FlashComment.ts

@@ -5,11 +5,11 @@ import type {
   FormattedComment,
   FormattedCommentWithFont,
   FormattedCommentWithSize,
+  IRenderer,
   MeasureTextInput,
   MeasureTextResult,
   Position,
 } from "@/@types/";
-import type { IRenderer } from "@/@types/renderer";
 import { config, options } from "@/definition/config";
 import { TypeGuardError } from "@/errors/TypeGuardError";
 import typeGuard from "@/typeGuard";

src/comments/HTML5Comment.ts

@@ -4,10 +4,10 @@ import type {
   FormattedCommentWithFont,
   FormattedCommentWithSize,
   HTML5Fonts,
+  IRenderer,
   MeasureTextInput,
   MeasureTextResult,
 } from "@/@types/";
-import type { IRenderer } from "@/@types/renderer";
 import { config, options } from "@/definition/config";
 import { TypeGuardError } from "@/errors/TypeGuardError";
 import typeGuard from "@/typeGuard";

src/contexts/cache.ts

@@ -1,4 +1,4 @@
-import type { IRenderer } from "@/@types/renderer";
+import type { IRenderer } from "@/@types/";
 
 let imageCache: {
   [key: string]: { image: IRenderer; timeout: number };

src/input/xml2js.ts

@@ -1,8 +1,7 @@
 import { parse } from "valibot";
 
-import type { FormattedComment, InputParser } from "@/@types";
-import type { Xml2jsPacket } from "@/@types/format.xml2js";
-import { ZXml2jsPacket } from "@/@types/format.xml2js";
+import type { FormattedComment, InputParser, Xml2jsPacket } from "@/@types";
+import { ZXml2jsPacket } from "@/@types/";
 
 export const Xml2jsParser: InputParser = {
   key: ["xml2js"],

src/main.ts

@@ -5,11 +5,11 @@ import type {
   IComment,
   InputFormat,
   IPluginList,
+  IRenderer,
   Options,
   Position,
   Timeline,
 } from "@/@types/";
-import type { IRenderer } from "@/@types/renderer";
 import { FlashComment } from "@/comments/";
 import {
   plugins,

src/renderer/canvas.ts

@@ -1,4 +1,4 @@
-import type { IRenderer } from "@/@types/renderer";
+import type { IRenderer } from "@/@types/";
 import { CanvasRenderingContext2DError } from "@/errors";
 
 /**

src/typeGuard.ts

@@ -34,6 +34,9 @@ import type {
   RawApiResponse,
   V1Comment,
   V1Thread,
+  Xml2jsChat,
+  Xml2jsChatItem,
+  Xml2jsPacket,
 } from "@/@types/";
 import {
   ZApiChat,
@@ -58,6 +61,9 @@ import {
   ZRawApiResponse,
   ZV1Comment,
   ZV1Thread,
+  ZXml2jsChat,
+  ZXml2jsChatItem,
+  ZXml2jsPacket,
 } from "@/@types/";
 import { colors } from "@/definition/colors";
 
@@ -117,6 +123,11 @@ const typeGuard = {
     }
     return true;
   },
+  xml2js: {
+    packet: (i: unknown): i is Xml2jsPacket => is(ZXml2jsPacket, i),
+    chat: (i: unknown): i is Xml2jsChat => is(ZXml2jsChat, i),
+    chatItem: (i: unknown): i is Xml2jsChatItem => is(ZXml2jsChatItem, i),
+  },
   legacyOwner: {
     comments: (i: unknown): i is string =>
       is(

src/utils/border.ts

@@ -1,4 +1,4 @@
-import type { IRenderer } from "@/@types/renderer";
+import type { IRenderer } from "@/@types/";
 
 /**
  * ボタンの左端枠を描画する

src/utils/niconico.ts

@@ -2,9 +2,9 @@ import type {
   CommentContentItem,
   CommentHTML5Font,
   CommentSize,
+  IRenderer,
   MeasureInput,
 } from "@/@types";
-import type { IRenderer } from "@/@types/renderer";
 import { config } from "@/definition/config";
 import { TypeGuardError } from "@/errors/TypeGuardError";
 

src/utils/plugins.ts

@@ -1,5 +1,4 @@
-import type { FormattedComment } from "@/@types";
-import type { IRenderer } from "@/@types/renderer";
+import type { FormattedComment, IRenderer } from "@/@types";
 import { HTML5Comment } from "@/comments";
 import { config } from "@/definition/config";