@fraqjs/fraq 0.12.0 → 0.12.1

package/dist/index.d.mts

@@ -5547,6 +5547,7 @@ type RouteActivation =
       type: 'prefix';
       prefix: string;
     };
+type RouteActivationInput = RouteActivation | readonly RouteActivation[];
 type RouteDescriptor =
   | {
       type: 'command';
@@ -5560,7 +5561,7 @@ type RouteDescriptor =
       path: readonly string[];
       meta?: RouteMeta;
     };
-type RouteActivationResolver = (route: RouteDescriptor, session: Session) => readonly RouteActivation[] | undefined;
+type RouteActivationResolver = (route: RouteDescriptor, session: Session) => RouteActivationInput | undefined;
 declare const defaultRouteActivationResolver: RouteActivationResolver;
 type RouteEntry =
   | {
@@ -5642,9 +5643,9 @@ declare class Router {
 //#endregion
 //#region src/core/activation.d.ts
 type ContextRouteActivationByScene = Partial<
-  Record<IncomingMessage['message_scene'] | 'default', readonly RouteActivation[]>
+  Record<IncomingMessage['message_scene'] | 'default', RouteActivationInput>
 >;
-type ContextRouteActivation = readonly RouteActivation[] | ContextRouteActivationByScene;
+type ContextRouteActivation = RouteActivationInput | ContextRouteActivationByScene;
 interface ContextRouteActivationMatcher {
   type?: RouteDescriptor['type'] | readonly RouteDescriptor['type'][];
   plugin?: string | readonly string[];
@@ -5956,6 +5957,7 @@ export {
   Plugin,
   RawPattern,
   RouteActivation,
+  RouteActivationInput,
   RouteActivationResolver,
   RouteBranch,
   RouteDescriptor,

package/dist/index.mjs

@@ -316,7 +316,7 @@ var Router = class Router {
 		for (const branch of this.branchesFrom(session, [], { includeHidden: true })) {
 			const descriptor = this.describeBranch(branch);
 			const activations = this.activationResolver(descriptor, session) ?? DEFAULT_ACTIVATIONS;
-			for (const activation of activations) {
+			for (const activation of routeActivationInputs(activations)) {
 				const tokenizer = new Tokenizer(message.segments);
 				if (!this.consumeActivation(tokenizer, activation, session)) continue;
 				const match = this.matchBranch(branch, tokenizer, activation);
@@ -485,6 +485,12 @@ var Router = class Router {
 		return params;
 	}
 };
+function routeActivationInputs(activations) {
+	return isRouteActivationArray(activations) ? activations : [activations];
+}
+function isRouteActivationArray(activations) {
+	return Array.isArray(activations);
+}
 //#endregion
 //#region src/core/activation.ts
 function createContextRouteActivationResolver(routing, fallback = defaultRouteActivationResolver) {
@@ -516,11 +522,14 @@ function isContextRouteActivationRuleArray(rules) {
 	return Array.isArray(rules);
 }
 function resolveContextRouteActivation(activation, scene) {
-	if (isRouteActivationArray(activation)) return activation;
+	if (isRouteActivationInput(activation)) return activation;
 	return activation[scene] ?? activation.default;
 }
-function isRouteActivationArray(activation) {
-	return Array.isArray(activation);
+function isRouteActivationInput(activation) {
+	return Array.isArray(activation) || isRouteActivation(activation);
+}
+function isRouteActivation(activation) {
+	return "type" in activation;
 }
 function matchesContextRouteActivationRule(route, session, rule) {
 	const match = rule.match;

package/package.json

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