@lionad/port-key 0.4.2 → 0.6.0

package/README.md

@@ -1,7 +1,7 @@
 # PortKey
 
 <p align="center">
-  <img width="200" src="/public/logo.png" />
+  <img width="200" src="https://raw.githubusercontent.com/Lionad-Morotar/port-key/main/public/logo.png" />
 </p>
 
 <p align="center">
@@ -96,7 +96,7 @@ npx -y @lionad/port-key-mcp
 - `-m, --map <object>`: custom mapping (JSON or JS-like object literal)
 - `--lang <code>`: output language (currently only `en` and `cn`, default: `cn`)
 - `-d, --digits <count>`: preferred digit count for port (4 or 5, default: 4)
-- `--padding-zero <true|false>`: Pad short ports with zero (default: true). e.g. "air" -> 1840
+- `--padding-zero <true|false>`: Pad to preferred digits with trailing zeros when input is short (default: true). e.g. `"air"` -> `1840`, `"1234" --digits 5` -> `12340`
 - `-h, --help`: show help
 
 Examples:
@@ -123,7 +123,7 @@ A full Example:
 {
   // Preferred digit count for port (4 or 5)
   "preferDigitCount": 5,
-  // Pad short ports with zero (default: true)
+  // Pad to preferred digits with trailing zeros when input is short (default: true)
   "paddingZero": true,
   // Custom letter-to-digit mapping
   "blockedPorts": [3000, 3001, 3002, 6666],
@@ -141,4 +141,4 @@ A full Example:
 
 - 本仓库采用 pnpm monorepo；核心包位于 `packages/core`。
 - 安装：在根目录执行 `pnpm install`。
-- 运行测试：`pnpm -C packages/core test` 或 `pnpm -C packages/core test:watch`。
+- 运行测试：`pnpm -C packages/core test` 或 `pnpm -C packages/core test:watch`。

package/locales/cn.json

@@ -7,10 +7,10 @@
   "optMap": "  -m, --map <对象>    自定义映射（JSON 或 JS 对象字面量）",
   "optLang": "      --lang <代码>   输出语言（en 或 cn）",
   "optDigits": "  -d, --digits <位数> 端口优先位数（4 或 5，默认：4）",
-  "optPadding": "      --padding-zero <true|false>  是否为短端口号补零（默认：true）",
+  "optPadding": "      --padding-zero <true|false>  输入不足位数时在末尾补 0 到偏好位数（默认：true）",
   "optHelp": "  -h, --help           显示帮助",
   "examples": "示例：",
-  "ex1": "  npx @lionad/port-key cfetch           # -> 34353",
+  "ex1": "  npx @lionad/port-key cfetch           # -> 3435",
   "ex2": "  npx @lionad/port-key my-app-01        # -> 7610",
   "ex3": "  npx @lionad/port-key -d 5 -- 013344   # -> 13344（5位端口）",
   "missingInput": "缺少输入文本。",

package/locales/en.json

@@ -7,10 +7,10 @@
   "optMap": "  -m, --map <object>   Custom mapping (JSON or JS-like object literal)",
   "optLang": "      --lang <code>    Output language (en or cn)",
   "optDigits": "  -d, --digits <count> Preferred digit count for port (4 or 5, default: 4)",
-  "optPadding": "      --padding-zero <true|false>  Pad short ports with zero (default: true)",
+  "optPadding": "      --padding-zero <true|false>  Pad to preferred digits with trailing zeros when input is short (default: true)",
   "optHelp": "  -h, --help           Show help",
   "examples": "Examples:",
-  "ex1": "  npx @lionad/port-key cfetch           # -> 34353",
+  "ex1": "  npx @lionad/port-key cfetch           # -> 3435",
   "ex2": "  npx @lionad/port-key my-app-01        # -> 7610",
   "ex3": "  npx @lionad/port-key -d 5 -- 013344   # -> 13344 (5-digit port)",
   "missingInput": "Missing input text.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lionad/port-key",
-  "version": "0.4.2",
+  "version": "0.6.0",
   "description": "A simple, practical port naming strategy",
   "type": "module",
   "types": "./src/port-key.d.ts",

package/src/cli.js

@@ -172,7 +172,6 @@ function runCli(argv, stdout = process.stdout, stderr = process.stderr, deps = {
     blockedPorts: effective.blockedPorts,
     minPort: effective.minPort,
     maxPort: effective.maxPort,
-    preferredRanges: effective.preferredRanges,
     preferDigitCount: effective.preferDigitCount,
     paddingZero: effective.paddingZero,
   });

package/src/config.js

@@ -45,18 +45,20 @@ function mergeConfig(base, override) {
   const a = base && typeof base === 'object' ? base : {};
   const b = override && typeof override === 'object' ? override : {};
 
-  return {
+  const merged = {
     ...a,
     ...b,
     map: b.map ?? a.map,
     blockedPorts: b.blockedPorts ?? a.blockedPorts,
     minPort: b.minPort ?? a.minPort,
     maxPort: b.maxPort ?? a.maxPort,
-    preferredRanges: b.preferredRanges ?? a.preferredRanges,
     preferDigitCount: b.preferDigitCount ?? a.preferDigitCount,
     paddingZero: b.paddingZero ?? a.paddingZero,
     lang: b.lang ?? a.lang,
   };
+  // preferredRanges 是未实现的死字段，透传会让用户误以为配置生效，显式剔除
+  delete merged.preferredRanges;
+  return merged;
 }
 
 function getPortKeyDirPath(deps = {}) {
@@ -98,7 +100,6 @@ function loadRunCount(deps = {}) {
 
 function incrementRunCount(deps = {}) {
   const fsModule = deps.fs || fs;
-  const pathModule = deps.path || path;
   const logPath = getLogPath(deps);
   const portKeyDir = getPortKeyDirPath(deps);
 

package/src/i18n.js

@@ -2,6 +2,7 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 const SUPPORTED = new Set(['en', 'cn']);
 let cache = {};
@@ -16,7 +17,9 @@ function loadMessages(lang = 'cn', deps = {}) {
   if (cache[l]) return cache[l];
   const fsModule = deps.fs || fs;
   const pathModule = deps.path || path;
-  const file = pathModule.join(pathModule.dirname(pathModule.dirname(import.meta.url.replace('file://', ''))), 'locales', `${l}.json`);
+  // 用 fileURLToPath 取得真实文件路径，避免手工剥离 file:// 前缀在 Windows 上得到 /C:/... 这类非法路径
+  const moduleDir = pathModule.dirname(fileURLToPath(import.meta.url));
+  const file = pathModule.join(pathModule.dirname(moduleDir), 'locales', `${l}.json`);
   const raw = fsModule.readFileSync(file, 'utf8');
   const json = JSON.parse(raw);
   cache[l] = json;

package/src/port-key.d.ts

@@ -12,6 +12,8 @@ export type PickPortOptions = {
   minPort?: number;
   maxPort?: number;
   blockedPorts?: ReadonlySet<number> | number[];
+  /** 短输入是否用 '0' 右补齐到 preferDigitCount 位，默认 true */
+  paddingZero?: boolean;
 };
 
 export const DEFAULT_MAP: Readonly<DigitLetterMap>;

package/src/port-key.js

@@ -63,11 +63,12 @@ function normalizeInput(text) {
 function mapToDigits(text, map = DEFAULT_MAP) {
   const reverse = buildReverseMap(map);
   const input = normalizeInput(text);
+  const hasLetter = /[a-z]/.test(input);
 
   let out = '';
   for (const ch of input) {
     if (ch >= '0' && ch <= '9') {
-      out += ch;
+      if (!hasLetter) out += ch;
       continue;
     }
 
@@ -97,60 +98,39 @@ function isPortBlocked(port, blockedPorts) {
 function pickPortFromDigits(digits, options = {}) {
   const raw = String(digits || '').replace(/[^0-9]/g, '');
   if (!raw) return { port: null, reason: 'No digits found in input' };
-  
-  const paddingZero = options.paddingZero !== false; // Default true
-  
-  // If not padding, enforce strict length check
-  // If padding, allow short length as it will be padded
-  if (!paddingZero && raw.length < 2) return { port: null, reason: 'Not enough digits to form a candidate' };
 
   const minPort = Number.isFinite(options.minPort) ? options.minPort : 0;
   const maxPort = Number.isFinite(options.maxPort) ? options.maxPort : 65535;
   const blockedPorts = options.blockedPorts || DEFAULT_BLOCKED_PORTS;
-  const preferDigitCount = options.preferDigitCount || 4;
-  // paddingZero is already defined above
+  // 位数仅接受 2~5 的整数，其余一律回退默认 4 位，避免 1 位端口或小数窗口等无意义结果
+  const preferDigitCount =
+    Number.isInteger(options.preferDigitCount) && options.preferDigitCount >= 2 && options.preferDigitCount <= 5
+      ? options.preferDigitCount
+      : 4;
+  const padToPreferredDigits =
+    options.padToPreferredDigits === undefined ? options.paddingZero !== false : Boolean(options.padToPreferredDigits);
 
   const candidates = [];
   const normalized = raw.replace(/^0+/, '');
-  
-  // Padding Logic for short inputs like "air" (184)
-  // If normalized length is small, we can pad it with zeros to match preferDigitCount or more
-  const paddedCandidates = [];
-  if (paddingZero && normalized.length > 0 && normalized.length < preferDigitCount) {
-    let current = normalized;
-    // Fix: start padding loop immediately
-    while (current.length <= 5) {
-       // Only push if length >= 2 (valid port min length logic) and >= preferDigitCount (if we want to respect preference)
-       // Actually, the original requirement says "pad ... to match preferDigitCount or more".
-       if (current.length >= preferDigitCount) {
-         paddedCandidates.push(current);
-       }
-       current += '0';
-    }
-  }
 
-  if (preferDigitCount && normalized.length >= preferDigitCount) {
-    candidates.push(normalized.slice(0, preferDigitCount));
-    candidates.push(normalized.slice(normalized.length - preferDigitCount));
-  } else {
-    // If not padding, try smaller lengths (if >= 2)
-    // Note: if paddedCandidates is empty, we must rely on this.
-    // But if we have paddedCandidates, we can still add these as fallbacks.
-    for (let len = Math.min(normalized.length, preferDigitCount); len >= 2; len -= 1) {
-      candidates.push(normalized.slice(0, len));
-    }
-    for (let len = Math.min(normalized.length, preferDigitCount); len >= 2; len -= 1) {
-      candidates.push(normalized.slice(normalized.length - len));
+  if (normalized.length >= preferDigitCount) {
+    for (let i = 0; i <= normalized.length - preferDigitCount; i += 1) {
+      candidates.push(normalized.slice(i, i + preferDigitCount));
     }
+  } else if (padToPreferredDigits && normalized.length > 0) {
+    candidates.push(normalized.padEnd(preferDigitCount, '0'));
+  } else if (normalized.length >= 2) {
+    candidates.push(normalized);
   }
-  
-  // Merge padded candidates
-  candidates.push(...paddedCandidates);
 
   const unique = Array.from(new Set(candidates));
   const rejectedCandidates = [];
   
   for (const c of unique) {
+    if (c.length > 1 && c.startsWith('0')) {
+      rejectedCandidates.push({ candidate: c, reason: 'Leading zero is not allowed' });
+      continue;
+    }
     const port = Number.parseInt(c, 10);
     if (!isValidPort(port)) {
       rejectedCandidates.push({ candidate: c, reason: 'Invalid port number' });
@@ -167,6 +147,21 @@ function pickPortFromDigits(digits, options = {}) {
     return { port, rejectedCandidates };
   }
 
+  if (preferDigitCount === 5) {
+    const fallback = pickPortFromDigits(raw, { ...options, preferDigitCount: 4 });
+    if (fallback && fallback.port !== null) {
+      return {
+        port: fallback.port,
+        rejectedCandidates: rejectedCandidates.concat(fallback.rejectedCandidates || []),
+      };
+    }
+    return {
+      port: null,
+      reason: fallback.reason || 'No valid port could be generated from input',
+      rejectedCandidates: rejectedCandidates.concat(fallback.rejectedCandidates || []),
+    };
+  }
+
   return { 
     port: null, 
     reason: 'No valid port could be generated from input',