@fraqjs/fraq 0.13.1 → 0.13.3

package/dist/index.d.mts

@@ -5542,6 +5542,7 @@ type RouteActivation =
     }
   | {
       type: 'mention';
+      prefix?: string;
     }
   | {
       type: 'prefix';

package/dist/index.mjs

@@ -316,7 +316,7 @@ var Router = class Router {
 		for (const branch of this.branchesFrom(session, [], { includeHidden: true })) {
 			const literalActivationIndex = branch.type === "rawPattern" ? Object.values(branch.rawPattern.pattern).findIndex((parameter) => parameter.capturer.typeInstruction.type === "literal") : -1;
 			let activationInputs = DEFAULT_ACTIVATIONS;
-			if (branch.type === "command" || literalActivationIndex !== -1) {
+			if (branch.type === "command" || literalActivationIndex !== -1 || branch.path.length > 0) {
 				const descriptor = this.describeBranch(branch);
 				const activations = this.activationResolver(descriptor, session) ?? DEFAULT_ACTIVATIONS;
 				activationInputs = Array.isArray(activations) ? activations : [activations];
@@ -366,12 +366,14 @@ var Router = class Router {
 	consumeActivation(tokenizer, activation, session) {
 		switch (activation.type) {
 			case "direct": return true;
-			case "mention": return tokenizer.consumeMention(session.selfId);
+			case "mention":
+				if (!tokenizer.consumeMention(session.selfId)) return false;
+				return activation.prefix === void 0 || tokenizer.consumeTextPrefix(activation.prefix);
 			case "prefix": return tokenizer.consumeTextPrefix(activation.prefix);
 		}
 	}
 	matchBranch(branch, tokenizer, activation, session, literalActivationIndex) {
-		if (branch.type === "command" && !this.consumeActivation(tokenizer, activation, session)) return;
+		if ((branch.type === "command" || branch.type === "rawPattern" && branch.path.length > 0 && literalActivationIndex === -1) && !this.consumeActivation(tokenizer, activation, session)) return;
 		if (!this.matchPath(branch.path, tokenizer)) return;
 		switch (branch.type) {
 			case "command": return this.matchCommand(branch.command, tokenizer, branch.path, activation);

package/package.json

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