@kotori-bot/core 1.4.1 → 1.5.0

package/lib/types/adapter.js

@@ -1,2 +1,29 @@
+
+/**
+ * @Package @kotori-bot/core
+ * @Version 1.4.2-beta.1
+ * @Author Hotaru <biyuehuya@gmail.com>
+ * @Copyright 2024 Hotaru. All rights reserved.
+ * @License GPL-3.0
+ * @Link https://github.com/kotorijs/kotori
+ * @Date 2024/6/6 21:03:53
+ */
+
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types/adapter.ts
+var adapter_exports = {};
+module.exports = __toCommonJS(adapter_exports);

package/lib/types/config.js

@@ -1,2 +1,29 @@
+
+/**
+ * @Package @kotori-bot/core
+ * @Version 1.4.2-beta.1
+ * @Author Hotaru <biyuehuya@gmail.com>
+ * @Copyright 2024 Hotaru. All rights reserved.
+ * @License GPL-3.0
+ * @Link https://github.com/kotorijs/kotori
+ * @Date 2024/6/6 21:03:53
+ */
+
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types/config.ts
+var config_exports = {};
+module.exports = __toCommonJS(config_exports);

package/lib/types/index.js

@@ -1,19 +1,75 @@
+
+/**
+ * @Package @kotori-bot/core
+ * @Version 1.4.2-beta.1
+ * @Author Hotaru <biyuehuya@gmail.com>
+ * @Copyright 2024 Hotaru. All rights reserved.
+ * @License GPL-3.0
+ * @Link https://github.com/kotorijs/kotori
+ * @Date 2024/6/6 21:03:53
+ */
+
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./config"), exports);
-__exportStar(require("./message"), exports);
-__exportStar(require("./adapter"), exports);
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types/index.ts
+var types_exports = {};
+__export(types_exports, {
+  CommandAccess: () => CommandAccess,
+  MessageScope: () => MessageScope,
+  commandArgTypeSignSchema: () => commandArgTypeSignSchema,
+  eventDataTargetIdSchema: () => eventDataTargetIdSchema
+});
+module.exports = __toCommonJS(types_exports);
+
+// src/types/message.ts
+var import_tsukiko = __toESM(require("tsukiko"));
+var CommandAccess = /* @__PURE__ */ ((CommandAccess2) => {
+  CommandAccess2[CommandAccess2["MEMBER"] = 0] = "MEMBER";
+  CommandAccess2[CommandAccess2["MANGER"] = 1] = "MANGER";
+  CommandAccess2[CommandAccess2["ADMIN"] = 2] = "ADMIN";
+  return CommandAccess2;
+})(CommandAccess || {});
+var commandArgTypeSignSchema = import_tsukiko.default.Union([
+  import_tsukiko.default.Union([import_tsukiko.default.Literal("string"), import_tsukiko.default.Literal("number")]),
+  import_tsukiko.default.Literal("boolean")
+]);
+var MessageScope = /* @__PURE__ */ ((MessageScope2) => {
+  MessageScope2[MessageScope2["PRIVATE"] = 0] = "PRIVATE";
+  MessageScope2[MessageScope2["GROUP"] = 1] = "GROUP";
+  return MessageScope2;
+})(MessageScope || {});
+var eventDataTargetIdSchema = import_tsukiko.default.Union([import_tsukiko.default.Number(), import_tsukiko.default.String()]);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CommandAccess,
+  MessageScope,
+  commandArgTypeSignSchema,
+  eventDataTargetIdSchema
+});

package/lib/types/message.d.ts

@@ -1,6 +1,6 @@
 import Tsu, { TsuError } from 'tsukiko';
 import type I18n from '@kotori-bot/i18n';
-import type { EventsList } from 'fluoro';
+import type { Context, EventsList } from 'fluoro';
 import type CommandError from '../utils/commandError';
 import type { Api, Elements } from '../service';
 import { Command } from '../utils/command';
@@ -11,6 +11,7 @@ declare module 'fluoro' {
         parse(data: EventDataParse): void;
         before_command(data: EventDataBeforeCommand): void;
         command(data: EventDataCommand): void;
+        regexp(data: EventDataRegexp): void;
         before_send(data: EventDataBeforeSend): void;
         send(data: EventDataSend): void;
         on_message(session: EventDataPrivateMsg | EventDataGroupMsg): void;
@@ -28,9 +29,11 @@ export declare const enum CommandAccess {
     MANGER = 1,
     ADMIN = 2
 }
-export type CommandAction = (data: {
-    args: CommandArgType[];
-    options: Record<string, CommandArgType>;
+export type ArgsOrigin = CommandArgType[];
+export type OptsOrigin = Record<string, CommandArgType>;
+export type CommandAction<Args = ArgsOrigin, Opts = OptsOrigin> = (data: {
+    args: Args;
+    options: Opts;
 }, session: SessionData) => MessageQuick;
 export type CommandArgType = string | number | boolean;
 export declare const commandArgTypeSignSchema: import("tsukiko").UnionParser<[import("tsukiko").UnionParser<[import("tsukiko").LiteralParser<"string">, import("tsukiko").LiteralParser<"number">]>, import("tsukiko").LiteralParser<"boolean">]>;
@@ -97,10 +100,14 @@ export declare enum MessageScope {
     GROUP = 1
 }
 export type MessageRaw = string;
-export type MessageQuickReal = MessageRaw | [string, Record<string, CommandArgType> | CommandArgType[]] | CommandError | void;
+export type MessageQuickReal = [string, (CommandArgType | undefined)[] | Record<string, CommandArgType | undefined>] | MessageRaw | CommandError | void;
 export type MessageQuick = MessageQuickReal | Promise<MessageQuickReal>;
 export type MidwareCallback = (next: () => void, session: SessionData) => MessageQuick;
 export type RegexpCallback = (match: RegExpMatchArray, session: SessionData) => MessageQuick;
+export type TaskCallback = (ctx: Context) => void;
+export type EventApiType = {
+    [K in keyof EventsList]: EventsList[K] extends EventDataApiBase ? EventsList[K] : never;
+};
 export declare const eventDataTargetIdSchema: import("tsukiko").UnionParser<[import("tsukiko").NumberParser, import("tsukiko").StringParser]>;
 export type EventDataTargetId = Tsu.infer<typeof eventDataTargetIdSchema>;
 interface EventDataMidwares {
@@ -129,6 +136,12 @@ interface EventDataCommand {
     command: Command;
     result: EventDataParse['result'] | MessageQuick;
 }
+interface EventDataRegexp {
+    session: SessionData;
+    raw: string;
+    regexp: RegExp;
+    result: RegExpMatchArray;
+}
 interface EventDataBeforeSend {
     api: Api;
     message: MessageRaw;
@@ -154,7 +167,7 @@ export interface EventDataApiBase {
     operatorId?: EventDataTargetId;
     i18n: I18n;
     send(message: MessageRaw): void;
-    format(template: string, data: Record<string, unknown> | CommandArgType[]): string;
+    format(template: string, data: Record<string, CommandArgType | undefined> | (CommandArgType | undefined)[]): string;
     quick(message: MessageQuick): void;
     prompt(message?: MessageRaw): Promise<MessageRaw>;
     confirm(options?: {

package/lib/types/message.js

@@ -1,17 +1,73 @@
+
+/**
+ * @Package @kotori-bot/core
+ * @Version 1.4.2-beta.1
+ * @Author Hotaru <biyuehuya@gmail.com>
+ * @Copyright 2024 Hotaru. All rights reserved.
+ * @License GPL-3.0
+ * @Link https://github.com/kotorijs/kotori
+ * @Date 2024/6/6 21:03:53
+ */
+
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.eventDataTargetIdSchema = exports.MessageScope = exports.commandArgTypeSignSchema = void 0;
-const tsukiko_1 = __importDefault(require("tsukiko"));
-exports.commandArgTypeSignSchema = tsukiko_1.default.Union([
-    tsukiko_1.default.Union([tsukiko_1.default.Literal('string'), tsukiko_1.default.Literal('number')]),
-    tsukiko_1.default.Literal('boolean')
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types/message.ts
+var message_exports = {};
+__export(message_exports, {
+  CommandAccess: () => CommandAccess,
+  MessageScope: () => MessageScope,
+  commandArgTypeSignSchema: () => commandArgTypeSignSchema,
+  eventDataTargetIdSchema: () => eventDataTargetIdSchema
+});
+module.exports = __toCommonJS(message_exports);
+var import_tsukiko = __toESM(require("tsukiko"));
+var CommandAccess = /* @__PURE__ */ ((CommandAccess2) => {
+  CommandAccess2[CommandAccess2["MEMBER"] = 0] = "MEMBER";
+  CommandAccess2[CommandAccess2["MANGER"] = 1] = "MANGER";
+  CommandAccess2[CommandAccess2["ADMIN"] = 2] = "ADMIN";
+  return CommandAccess2;
+})(CommandAccess || {});
+var commandArgTypeSignSchema = import_tsukiko.default.Union([
+  import_tsukiko.default.Union([import_tsukiko.default.Literal("string"), import_tsukiko.default.Literal("number")]),
+  import_tsukiko.default.Literal("boolean")
 ]);
-var MessageScope;
-(function (MessageScope) {
-    MessageScope[MessageScope["PRIVATE"] = 0] = "PRIVATE";
-    MessageScope[MessageScope["GROUP"] = 1] = "GROUP";
-})(MessageScope || (exports.MessageScope = MessageScope = {}));
-exports.eventDataTargetIdSchema = tsukiko_1.default.Union([tsukiko_1.default.Number(), tsukiko_1.default.String()]);
+var MessageScope = /* @__PURE__ */ ((MessageScope2) => {
+  MessageScope2[MessageScope2["PRIVATE"] = 0] = "PRIVATE";
+  MessageScope2[MessageScope2["GROUP"] = 1] = "GROUP";
+  return MessageScope2;
+})(MessageScope || {});
+var eventDataTargetIdSchema = import_tsukiko.default.Union([import_tsukiko.default.Number(), import_tsukiko.default.String()]);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CommandAccess,
+  MessageScope,
+  commandArgTypeSignSchema,
+  eventDataTargetIdSchema
+});

package/lib/utils/command.d.ts

@@ -1,4 +1,4 @@
-import { CommandAccess, type CommandAction, type CommandArgType, type CommandArgTypeSign, type CommandConfig } from '../types';
+import { CommandAccess, type CommandAction, type CommandArgType, type CommandArgTypeSign, type CommandConfig, ArgsOrigin, OptsOrigin } from '../types';
 import { CommandError } from './commandError';
 interface CommandArg {
     name: string;
@@ -13,7 +13,7 @@ interface CommandOption {
     realname: string;
     description?: string;
 }
-interface CommandData {
+interface CommandData<Args = ArgsOrigin, Opts = OptsOrigin> {
     root: string;
     alias: string[];
     args: CommandArg[];
@@ -21,23 +21,31 @@ interface CommandData {
     scope: CommandConfig['scope'];
     access: CommandAccess;
     help?: string;
-    action?: CommandAction;
+    action?: CommandAction<Args, Opts>;
     description?: string;
 }
-export declare class Command {
+type GetSignType<T extends string> = T extends `${string}number${string}` ? number : T extends `${string}boolean${string}` ? boolean : string;
+type GetArgCtn<Template extends string> = Template extends `${string}:${infer Suffix}` ? Suffix extends `${infer T}=${string}` ? GetSignType<T> : GetSignType<Suffix> : Template extends `${infer T}=${string}` ? GetSignType<T> : string;
+type ParseArgs<Template extends string> = string extends Template ? ArgsOrigin : Template extends `${string} ${`<${infer Ctn}>`}${infer Rest}` ? Ctn extends `...${infer Ctn2}` ? [...GetSignType<Ctn2>[]] : [GetArgCtn<Ctn>, ...ParseArgs<Rest>] : Template extends `${string} [${infer Ctn}]${infer Rest}` ? Ctn extends `${infer Ctn2}=${string}` ? Ctn2 extends `...${infer Ctn3}` ? [...GetSignType<Ctn3>[]] : [GetArgCtn<Ctn2>, ...ParseArgs<Rest>] : Ctn extends `...${infer Ctn2}` ? [...GetSignType<Ctn2>[]] : [GetArgCtn<Ctn>?, ...ParseArgs<Rest>] : [];
+type ParseOpts<Template extends string> = string extends Template ? {} : Template extends `${infer K}:${infer V}` ? GetSignType<V> extends Boolean ? {
+    [C in K]: GetSignType<V>;
+} : {
+    [C in K]?: GetSignType<V>;
+} : {};
+export declare class Command<Template extends string = string, Opts extends OptsOrigin = OptsOrigin> {
     static run(input: string, data: CommandData): CommandError | {
-        args: CommandArgType[];
-        options: Record<string, CommandArgType>;
+        args: ArgsOrigin;
+        options: OptsOrigin;
     };
     private template;
-    readonly meta: CommandData;
-    constructor(template: string, config?: CommandConfig);
+    readonly meta: CommandData<ParseArgs<Template>, Opts>;
+    constructor(template: Template, config?: CommandConfig);
     private parse;
     alias(alias: string | string[]): this;
     scope(scope: CommandConfig['scope']): this;
     access(access: CommandAccess): this;
-    option(name: string, template: string): this;
-    action(callback: CommandAction): this;
+    option<TemplateOpt extends string>(name: string, template: TemplateOpt): Command<Template, Opts & ParseOpts<TemplateOpt>>;
+    action(callback: CommandAction<ParseArgs<Template>, Opts>): this;
     help(text: string): this;
 }
 export default Command;