@nocobase/cli 2.1.4-test.2 → 2.1.4-test.3

package/bin/early-locale.js

@@ -0,0 +1,89 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+export function normalizeEarlyCliLocale(value) {
+  const normalized = String(value ?? '')
+    .trim()
+    .replace(/\..*$/, '')
+    .replace(/_/g, '-')
+    .toLowerCase();
+
+  if (normalized === 'zh' || normalized.startsWith('zh-')) {
+    return 'zh-CN';
+  }
+
+  if (normalized === 'en' || normalized.startsWith('en-')) {
+    return 'en-US';
+  }
+
+  return undefined;
+}
+
+function readConfiguredEarlyCliLocale() {
+  try {
+    const cliHomeRoot = String(process.env.NB_CLI_ROOT ?? '').trim() || os.homedir();
+    const configPath = path.join(cliHomeRoot, '.nocobase', 'config.json');
+    const content = fs.readFileSync(configPath, 'utf8');
+    const parsed = JSON.parse(content);
+    return normalizeEarlyCliLocale(parsed?.settings?.locale);
+  } catch {
+    return undefined;
+  }
+}
+
+export function detectEarlyCliLocale() {
+  const candidates = [
+    process.env.NB_LOCALE,
+    readConfiguredEarlyCliLocale(),
+    process.env.LC_ALL,
+    process.env.LC_MESSAGES,
+    process.env.LANG,
+    Intl.DateTimeFormat().resolvedOptions().locale,
+  ];
+
+  for (const candidate of candidates) {
+    const locale = normalizeEarlyCliLocale(candidate);
+    if (locale) {
+      return locale;
+    }
+  }
+
+  return 'en-US';
+}
+
+function getEarlyLocalePathValue(input, key) {
+  let current = input;
+  for (const part of key.split('.')) {
+    if (!current || typeof current !== 'object' || !Object.prototype.hasOwnProperty.call(current, part)) {
+      return undefined;
+    }
+    current = current[part];
+  }
+  return typeof current === 'string' ? current : undefined;
+}
+
+function readEarlyLocaleMessages(locale) {
+  const moduleDir = path.dirname(fileURLToPath(import.meta.url));
+  const packageRoot = path.resolve(moduleDir, '..');
+  const localePaths = [
+    path.join(packageRoot, 'src', 'locale', `${locale}.json`),
+    path.join(packageRoot, 'dist', 'locale', `${locale}.json`),
+  ];
+
+  for (const localePath of localePaths) {
+    try {
+      return JSON.parse(fs.readFileSync(localePath, 'utf8'));
+    } catch {
+      // Try the next runtime layout.
+    }
+  }
+
+  return undefined;
+}
+
+export function translateEarlyCli(key, fallback, locale = detectEarlyCliLocale()) {
+  const messages = readEarlyLocaleMessages(locale);
+  return getEarlyLocalePathValue(messages, key) ?? fallback;
+}

package/bin/run.js

@@ -8,6 +8,7 @@ import pc from 'picocolors';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { formatUnsupportedNodeVersionMessage, isSupportedNodeVersion } from './node-version.js';
 import { normalizeNodeOptions, normalizeSessionEnv } from './session-env.js';
+import { ensureWindowsAdministrator } from './windows-admin.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const requireFromCli = createRequire(import.meta.url);
@@ -27,54 +28,6 @@ if (!isSupportedNodeVersion()) {
 normalizeSessionEnv();
 normalizeNodeOptions();
 
-const windowsAdministratorCheckScript = [
-  '$identity = [Security.Principal.WindowsIdentity]::GetCurrent();',
-  '$principal = New-Object Security.Principal.WindowsPrincipal($identity);',
-  'if ($principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) { exit 0 }',
-  'exit 1',
-].join(' ');
-
-function isWindowsAdministrator() {
-  for (const command of ['pwsh.exe', 'powershell.exe']) {
-    const result = spawnSync(
-      command,
-      ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command', windowsAdministratorCheckScript],
-      {
-        stdio: 'ignore',
-        windowsHide: true,
-      },
-    );
-
-    if (result.error?.code === 'ENOENT') {
-      continue;
-    }
-
-    return result.status === 0;
-  }
-
-  return false;
-}
-
-function ensureWindowsAdministrator() {
-  if (process.platform !== 'win32' || process.env.NB_CLI_WINDOWS_ADMIN_CHECKED === '1') {
-    return;
-  }
-
-  if (!isWindowsAdministrator()) {
-    console.error(
-      pc.red(
-        [
-          'NocoBase CLI must be run as Administrator on Windows.',
-          'Open PowerShell 5 or PowerShell 7 with "Run as administrator", then run the command again.',
-        ].join('\n'),
-      ),
-    );
-    process.exit(1);
-  }
-
-  process.env.NB_CLI_WINDOWS_ADMIN_CHECKED = '1';
-}
-
 ensureWindowsAdministrator();
 
 /**

package/bin/windows-admin.js

@@ -0,0 +1,60 @@
+import { spawnSync } from 'node:child_process';
+import pc from 'picocolors';
+import { detectEarlyCliLocale, translateEarlyCli } from './early-locale.js';
+
+const windowsAdministratorCheckScript = [
+  '$identity = [Security.Principal.WindowsIdentity]::GetCurrent();',
+  '$principal = New-Object Security.Principal.WindowsPrincipal($identity);',
+  'if ($principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) { exit 0 }',
+  'exit 1',
+].join(' ');
+
+export function formatWindowsAdministratorRequiredMessage() {
+  const locale = detectEarlyCliLocale();
+  const message = translateEarlyCli(
+    'entry.windowsAdministratorRequired.message',
+    'NocoBase CLI must be run as Administrator on Windows.',
+    locale,
+  );
+  const hint = translateEarlyCli(
+    'entry.windowsAdministratorRequired.hint',
+    'Open your terminal as Administrator, then run the command again.',
+    locale,
+  );
+
+  return [message, hint].join('\n');
+}
+
+function isWindowsAdministrator() {
+  for (const command of ['pwsh.exe', 'powershell.exe']) {
+    const result = spawnSync(
+      command,
+      ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command', windowsAdministratorCheckScript],
+      {
+        stdio: 'ignore',
+        windowsHide: true,
+      },
+    );
+
+    if (result.error?.code === 'ENOENT') {
+      continue;
+    }
+
+    return result.status === 0;
+  }
+
+  return false;
+}
+
+export function ensureWindowsAdministrator() {
+  if (process.platform !== 'win32' || process.env.NB_CLI_WINDOWS_ADMIN_CHECKED === '1') {
+    return;
+  }
+
+  if (!isWindowsAdministrator()) {
+    console.error(pc.red(formatWindowsAdministratorRequiredMessage()));
+    process.exit(1);
+  }
+
+  process.env.NB_CLI_WINDOWS_ADMIN_CHECKED = '1';
+}

package/dist/locale/en-US.json

@@ -1,4 +1,10 @@
 {
+  "entry": {
+    "windowsAdministratorRequired": {
+      "message": "NocoBase CLI must be run as Administrator on Windows.",
+      "hint": "Open your terminal as Administrator, then run the command again."
+    }
+  },
   "promptCatalog": {
     "common": {
       "cancelled": "Cancelled.",

package/dist/locale/zh-CN.json

@@ -1,4 +1,10 @@
 {
+  "entry": {
+    "windowsAdministratorRequired": {
+      "message": "Windows 上运行 NocoBase CLI 必须使用管理员模式。",
+      "hint": "请以管理员身份打开终端，然后重新执行命令。"
+    }
+  },
   "promptCatalog": {
     "common": {
       "cancelled": "已取消。",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.4-test.2",
+  "version": "2.1.4-test.3",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",