@fraqjs/fraq 0.7.0 → 0.8.0

package/README.md

@@ -27,15 +27,15 @@ const ctx = Context.fromUrl('<替换成你的 Milky 协议端地址>', {
   // accessToken: '<如果你的 Milky 协议端配置了 token，请在这里添加>',
 });
 
-ctx.router.command(
-  'echo',
-  {
+ctx.router.command({
+  name: 'echo',
+  pattern: {
     content: param.greedy(),
   },
-  (session, { content }) => {
+  execute(session, { content }) {
     session.reply(msg`You said: ${content}`);
   },
-);
+});
 
 ctx.start();
 ```

package/dist/index.d.mts

@@ -5505,21 +5505,21 @@ declare namespace param {
 //#region src/routing/router.d.ts
 type Pattern = Record<string, Parameter<any>>;
 type ParamsOf<P extends Pattern> = { [K in keyof P]: P[K] extends Parameter<infer T> ? T : never };
-type Handler<P extends Pattern> = (session: Session, params: ParamsOf<P>) => void | Promise<void>;
+type Executor<P extends Pattern> = (session: Session, params: ParamsOf<P>) => void | Promise<void>;
 type SessionPredicate = (session: Session) => boolean;
-interface Command {
+interface Command<P extends Pattern> {
   name: string;
-  pattern: Pattern;
-  handler: (session: Session, params: any) => void | Promise<void>;
+  pattern: P;
+  execute: Executor<P>;
 }
-interface RawPattern {
-  pattern: Pattern;
-  handler: (session: Session, params: any) => void | Promise<void>;
+interface RawPattern<P extends Pattern> {
+  pattern: P;
+  execute: Executor<P>;
 }
 type RouteEntry =
   | {
       type: 'command';
-      command: Command;
+      command: Command<Pattern>;
     }
   | {
       type: 'group';
@@ -5533,30 +5533,30 @@ type RouteEntry =
     }
   | {
       type: 'rawPattern';
-      rawPattern: RawPattern;
+      rawPattern: RawPattern<Pattern>;
     };
 type RouteBranch =
   | {
       type: 'command';
       path: string[];
-      command: Command;
+      command: Command<Pattern>;
     }
   | {
       type: 'rawPattern';
       path: string[];
-      rawPattern: RawPattern;
+      rawPattern: RawPattern<Pattern>;
     };
 type RouteMatchResult =
   | {
       type: 'command';
       path: string[];
-      command: Command;
+      command: Command<Pattern>;
       params: any;
     }
   | {
       type: 'rawPattern';
       path: string[];
-      rawPattern: RawPattern;
+      rawPattern: RawPattern<Pattern>;
       params: any;
     };
 interface Session {
@@ -5566,8 +5566,8 @@ interface Session {
 declare class Router {
   private readonly entries;
   private readonly groups;
-  command<P extends Pattern>(name: string, pattern: P, handler: Handler<P>): this;
-  rawPattern<P extends Pattern>(pattern: P, handler: Handler<P>): this;
+  command<P extends Pattern>(command: Command<P>): this;
+  rawPattern<P extends Pattern>(rawPattern: RawPattern<P>): this;
   group(name: string): Router;
   filter(predicate: SessionPredicate): Router;
   routes(): RouteEntry[];
@@ -5781,8 +5781,8 @@ export {
   ContextUrlOptions,
   Disposable,
   EventMap,
+  Executor,
   Filter,
-  Handler,
   Injection,
   LogHandler,
   LogLevel,

package/dist/index.mjs

@@ -164,25 +164,17 @@ var Tokenizer = class {
 var Router = class Router {
 	entries = [];
 	groups = /* @__PURE__ */ new Map();
-	command(name, pattern, handler) {
-		const command = {
-			name,
-			pattern,
-			handler
-		};
+	command(command) {
 		this.entries.push({
 			type: "command",
 			command
 		});
 		return this;
 	}
-	rawPattern(pattern, handler) {
-		if (Object.keys(pattern).length === 0) throw new Error("Raw pattern must have at least one parameter.");
-		if (pattern[Object.keys(pattern)[0]].capturer.typeInstruction.type === "literal") throw new Error("The first parameter of a raw pattern cannot be a literal, as it would conflict with command patterns.");
-		const rawPattern = {
-			pattern,
-			handler
-		};
+	rawPattern(rawPattern) {
+		if (Object.keys(rawPattern.pattern).length === 0) throw new Error("Raw pattern must have at least one parameter.");
+		const firstKey = Object.keys(rawPattern.pattern)[0];
+		if (rawPattern.pattern[firstKey].capturer.typeInstruction.type === "literal") throw new Error("The first parameter of a raw pattern cannot be a literal, as it would conflict with command patterns.");
 		this.entries.push({
 			type: "rawPattern",
 			rawPattern
@@ -226,10 +218,10 @@ var Router = class Router {
 		if (match === void 0) return false;
 		switch (match.type) {
 			case "command":
-				await match.command.handler(session, match.params);
+				await match.command.execute(session, match.params);
 				break;
 			case "rawPattern":
-				await match.rawPattern.handler(session, match.params);
+				await match.rawPattern.execute(session, match.params);
 				break;
 		}
 		return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fraqjs/fraq",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Milky Bot framework",
   "files": [
     "dist"