@fraqjs/fraq 0.8.1 → 0.9.0

package/README.md

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

package/dist/index.d.mts

@@ -5506,11 +5506,10 @@ declare namespace param {
   >;
 }
 //#endregion
-//#region src/routing/router.d.ts
+//#region src/routing/command.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 Executor<P extends Pattern> = (session: Session, params: ParamsOf<P>) => void | Promise<void>;
-type SessionPredicate = (session: Session) => boolean;
 interface Command<P extends Pattern> {
   name: string;
   pattern: P;
@@ -5520,6 +5519,32 @@ interface RawPattern<P extends Pattern> {
   pattern: P;
   execute: Executor<P>;
 }
+interface Session {
+  raw: IncomingMessage;
+  reply(segments: OutgoingSegment_ZodInput[]): Promise<void>;
+}
+declare class CommandBuilder<P extends Pattern = {}, S = Command<P>> {
+  readonly name: string;
+  private readonly sink;
+  private readonly pattern;
+  private executor?;
+  constructor(name: string, sink?: (command: Command<P>) => S);
+  arg<K extends string, T>(
+    key: K,
+    parameter: Parameter<T>,
+  ): CommandBuilder<
+    P & { [K2 in K]: Parameter<T> },
+    S extends Command<P>
+      ? Command<P & { [K2 in K]: Parameter<T> }>
+      : S extends RawPattern<P>
+        ? RawPattern<P & { [K2 in K]: Parameter<T> }>
+        : S
+  >;
+  execute(executor: Executor<P>): S;
+}
+//#endregion
+//#region src/routing/router.d.ts
+type SessionPredicate = (session: Session) => boolean;
 type RouteEntry =
   | {
       type: 'command';
@@ -5563,14 +5588,12 @@ type RouteMatchResult =
       rawPattern: RawPattern<Pattern>;
       params: any;
     };
-interface Session {
-  raw: IncomingMessage;
-  reply(segments: OutgoingSegment_ZodInput[]): Promise<void>;
-}
 declare class Router {
   private readonly entries;
   private readonly groups;
+  command(name: string): CommandBuilder;
   command<P extends Pattern>(command: Command<P>): this;
+  rawPattern(): CommandBuilder<{}, RawPattern<{}>>;
   rawPattern<P extends Pattern>(rawPattern: RawPattern<P>): this;
   group(name: string): Router;
   filter(predicate: SessionPredicate): Router;
@@ -5594,7 +5617,9 @@ declare namespace filter {
   function define(filter: Filter): Filter;
   function allPass(): Filter;
   function friend(...uinList: number[]): Filter;
+  function allFriends(): Filter;
   function group(...uinList: number[]): Filter;
+  function allGroups(): Filter;
   function admin(): Filter;
   function or(...filters: Filter[]): Filter;
   function and(...filters: Filter[]): Filter;
@@ -5782,6 +5807,7 @@ export {
   ApiEndpoints,
   Capturer,
   Command,
+  CommandBuilder,
   Context,
   ContextOptions,
   ContextUrlOptions,

package/dist/index.mjs

@@ -64,6 +64,31 @@ function createMilkyClient(...params) {
 	} });
 }
 //#endregion
+//#region src/routing/command.ts
+var CommandBuilder = class {
+	name;
+	sink;
+	pattern = {};
+	executor;
+	constructor(name, sink = (command) => command) {
+		this.name = name;
+		this.sink = sink;
+	}
+	arg(key, parameter) {
+		this.pattern[key] = parameter;
+		return this;
+	}
+	execute(executor) {
+		this.executor = executor;
+		const command = {
+			name: this.name,
+			pattern: this.pattern,
+			execute: this.executor
+		};
+		return this.sink(command);
+	}
+};
+//#endregion
 //#region src/routing/tokenizer.ts
 var Tokenizer = class {
 	segments;
@@ -192,6 +217,10 @@ var Router = class Router {
 	entries = [];
 	groups = /* @__PURE__ */ new Map();
 	command(command) {
+		if (typeof command === "string") return new CommandBuilder(command, (builtCommand) => {
+			this.command(builtCommand);
+			return builtCommand;
+		});
 		this.validatePattern(command.pattern);
 		this.entries.push({
 			type: "command",
@@ -200,6 +229,10 @@ var Router = class Router {
 		return this;
 	}
 	rawPattern(rawPattern) {
+		if (!rawPattern) return new CommandBuilder("", (builtCommand) => {
+			this.rawPattern(builtCommand);
+			return builtCommand;
+		});
 		this.validatePattern(rawPattern.pattern, { rawPattern: true });
 		this.entries.push({
 			type: "rawPattern",
@@ -878,6 +911,17 @@ let filter;
 		};
 	}
 	_filter.friend = friend;
+	function allFriends() {
+		return {
+			message_receive: ({ data }) => data.message_scene === "friend",
+			message_recall: ({ data }) => data.message_scene === "friend",
+			peer_pin_change: ({ data }) => data.message_scene === "friend",
+			group_invitation: () => true,
+			friend_nudge: () => true,
+			friend_file_upload: () => true
+		};
+	}
+	_filter.allFriends = allFriends;
 	function group(...uinList) {
 		const uinSet = new Set(uinList);
 		return {
@@ -899,6 +943,26 @@ let filter;
 		};
 	}
 	_filter.group = group;
+	function allGroups() {
+		return {
+			message_receive: ({ data }) => data.message_scene === "group",
+			message_recall: ({ data }) => data.message_scene === "group",
+			peer_pin_change: ({ data }) => data.message_scene === "group",
+			group_join_request: () => true,
+			group_invited_join_request: () => true,
+			group_admin_change: () => true,
+			group_essence_message_change: () => true,
+			group_member_increase: () => true,
+			group_member_decrease: () => true,
+			group_name_change: () => true,
+			group_message_reaction: () => true,
+			group_mute: () => true,
+			group_whole_mute: () => true,
+			group_nudge: () => true,
+			group_file_upload: () => true
+		};
+	}
+	_filter.allGroups = allGroups;
 	function admin() {
 		return { message_receive: ({ data }) => data.message_scene === "group" && data.group_member.role !== "member" };
 	}
@@ -1199,4 +1263,4 @@ let param;
 	_param.segment = segment;
 })(param || (param = {}));
 //#endregion
-export { Context, Logger, Parameter, Router, combineLogHandlers, createMilkyClient, definePlugin, filter, implementsESNextDisposable, isDisposable, milkyPackageVersion, milkyVersion, msg, param, seg };
+export { CommandBuilder, Context, Logger, Parameter, Router, combineLogHandlers, createMilkyClient, definePlugin, filter, implementsESNextDisposable, isDisposable, milkyPackageVersion, milkyVersion, msg, param, seg };

package/package.json

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