Merge pull request #827 from ninoseki/use-command-schema

refactor: use CommandSchema/Type

src/command/packer.ts

@@ -1,14 +1,14 @@
 import truncate from "just-truncate";
 
-import type { Command } from "~/types";
+import type { CommandType } from "~/schemas";
 
 const abbreviations = ["ip", "asn", "btc", "cve", "eth", "url"];
 
 function capitalize(s: string) {
   return s.charAt(0).toUpperCase() + s.slice(1);
 }
 
-export function commandToID(command: Command): string {
+export function commandToID(command: CommandType): string {
   return JSON.stringify(command);
 }
 
@@ -24,7 +24,7 @@ function normalizeCommandType(commandType: string): string {
   return commandType;
 }
 
-export function commandToMessage(command: Command): string {
+export function commandToMessage(command: CommandType): string {
   return `${capitalize(command.action)} ${truncate(
     command.query,
   )} as ${normalizeCommandType(command.type)} on ${command.name}`;

src/command/runner.ts

@@ -1,10 +1,9 @@
 import { err, errAsync, ok, okAsync, Result, ResultAsync } from "neverthrow";
 
 import { URLScan } from "~/scanner";
-import type { OptionsType } from "~/schemas";
+import type { CommandType, OptionsType } from "~/schemas";
 import { Selector } from "~/selector";
 import type {
-  Command,
   Scanner,
   ScannerMap,
   Searcher,
@@ -14,10 +13,10 @@ import type {
 import { isScanner, isSearcher } from "~/utils";
 
 export class CommandRunner {
-  public command: Command;
+  public command: CommandType;
   protected options: OptionsType;
 
-  public constructor(command: Command, options: OptionsType) {
+  public constructor(command: CommandType, options: OptionsType) {
     this.command = command;
     this.options = options;
   }

src/schemas.ts

@@ -58,3 +58,5 @@ export const CommandSchema = v.object({
   type: Searchable,
   name: v.string(),
 });
+
+export type CommandType = v.InferOutput<typeof CommandSchema>;

src/types.ts

@@ -1,6 +1,6 @@
 import { Result, ResultAsync } from "neverthrow";
 
-import type { CommandActionType, OptionsType, SearchableType } from "~/schemas";
+import type { OptionsType, SearchableType } from "~/schemas";
 
 export const SEARCHABLE_TYPES: SearchableType[] = [
   "asn",
@@ -83,13 +83,6 @@ export interface ScannerMap {
   ) => ResultAsync<string, string>;
 }
 
-export interface Command {
-  action: CommandActionType;
-  query: string;
-  type: SearchableType;
-  name: string;
-}
-
 export const MD5_LENGTH = 32;
 export const SHA1_LENGTH = 40;
 export const SHA256_LENGTH = 64;