alemonjs 2.1.76 → 2.1.77

package/lib/app/router/dsl.js

@@ -72,6 +72,13 @@ function getImporterLabel(importer, index) {
 function formatRouteDescription(description) {
     return typeof description === 'string' && description.trim() ? description.trim() : undefined;
 }
+function formatArgReference(arg, displayIndex) {
+    const name = typeof arg.name === 'string' ? arg.name.trim() : '';
+    if (name) {
+        return `参数「${name}」`;
+    }
+    return `第${displayIndex}个参数`;
+}
 function formatArgRuleHint(arg, displayIndex) {
     const rules = arg.rules ?? [];
     const parts = [];
@@ -105,7 +112,7 @@ function formatArgRuleHint(arg, displayIndex) {
         parts.push(`最大 ${typeRule.max}`);
     }
     const suffix = arg.description ? `，${arg.description}` : '';
-    return `参数${displayIndex} \`${arg.name}\`：${parts.join('，')}${suffix}`;
+    return `${formatArgReference(arg, displayIndex)}：${parts.join('，')}${suffix}`;
 }
 function buildSchemaHints(schema) {
     const args = schema?.args ?? [];

package/lib/app/router/fallback.js

@@ -21,11 +21,15 @@ function levenshteinDistance(a, b) {
 function normalizeForCompare(text) {
     return text.replace(/^([!！/#＃])\s*/, '').trim();
 }
+function escapeRegExp(text) {
+    return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 function shouldCheckCandidate(messageText, candidate) {
     if (!messageText || !candidate) {
         return false;
     }
-    return messageText.startsWith(candidate);
+    const candidatePattern = new RegExp(`^${escapeRegExp(candidate)}(?:\\s|$)`);
+    return candidatePattern.test(messageText);
 }
 function getAdaptiveMaxDistance(input) {
     if (input.length <= 2) {

package/lib/app/router/validator.js

@@ -20,6 +20,24 @@ function getMaxArgs(schema) {
     }
     return args.length > 0 ? args.length : undefined;
 }
+function getMissingRequiredArg(rawArgs, schema) {
+    const args = schema?.args ?? [];
+    for (let index = 0; index < args.length; index += 1) {
+        const arg = args[index];
+        const requiredRule = getRequiredRule(arg);
+        if (!requiredRule) {
+            continue;
+        }
+        const rawValue = arg.rules?.some(rule => rule.type === 'rest') ? rawArgs.slice(index).join(' ').trim() : rawArgs[index];
+        if (rawValue === undefined || rawValue === '') {
+            return {
+                arg,
+                displayIndex: index + 1
+            };
+        }
+    }
+    return null;
+}
 function parseRange(rawValue, rule) {
     const separators = rule.separators ?? ['-', '－'];
     const separator = separators.find(item => rawValue.includes(item));
@@ -34,8 +52,15 @@ function parseRange(rawValue, rule) {
     }
     return { start, end };
 }
+function formatArgReference(argName, displayIndex) {
+    const name = String(argName ?? '').trim();
+    if (name) {
+        return `参数「${name}」`;
+    }
+    return `第${displayIndex}个参数`;
+}
 function validateTypedRule(rawValue, rule, context, usage) {
-    const messagePrefix = `参数${context.displayIndex}`;
+    const messagePrefix = formatArgReference(context.argName, context.displayIndex);
     const normalizedValue = rule.normalizeMap?.[rawValue] ?? rawValue;
     if (rule.pattern) {
         rule.pattern.lastIndex = 0;
@@ -226,9 +251,10 @@ function validateRouteArgsForCommand(commandPath, rawArgs, schema) {
     const maxArgs = getMaxArgs(schema);
     const usage = schema?.usage;
     if (rawArgs.length < minArgs) {
+        const missingRequiredArg = getMissingRequiredArg(rawArgs, schema);
         return {
             valid: false,
-            error: schema?.messages?.tooFewArgs ?? `至少需要 ${minArgs} 个参数`,
+            error: schema?.messages?.tooFewArgs ?? (missingRequiredArg ? `${formatArgReference(missingRequiredArg.arg.name, missingRequiredArg.displayIndex)}是必填的` : `至少需要 ${minArgs} 个参数`),
             usage
         };
     }
@@ -252,7 +278,7 @@ function validateRouteArgsForCommand(commandPath, rawArgs, schema) {
                 if (requiredRule) {
                     return {
                         valid: false,
-                        error: requiredRule.message ?? `参数${displayIndex}是必填的`,
+                        error: requiredRule.message ?? `${formatArgReference(arg.name, displayIndex)}是必填的`,
                         usage
                     };
                 }
@@ -282,7 +308,7 @@ function validateRouteArgsForCommand(commandPath, rawArgs, schema) {
             if (requiredRule) {
                 return {
                     valid: false,
-                    error: requiredRule.message ?? `参数${displayIndex}是必填的`,
+                    error: requiredRule.message ?? `${formatArgReference(arg.name, displayIndex)}是必填的`,
                     usage
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.76",
+  "version": "2.1.77",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",