@4399ywkf/core 5.4.0 → 5.4.1

package/dist/cli/index.js

@@ -631,7 +631,7 @@ function scaffoldSourceFiles(cwd, sourceDir, namespaces, logger) {
   }
   const indexPath = join3(dir, "index.ts");
   if (!existsSync3(indexPath)) {
-    const imports = namespaces.map((ns) => `import ${ns} from "./${ns}";`).join("\n");
+    const imports = namespaces.map((ns) => `import ${ns} from './${ns}';`).join("\n");
     const entries = namespaces.join(",\n  ");
     const content = `${imports}
 
@@ -648,19 +648,19 @@ export default resources;
 function buildDefaultNsFile(ns) {
   if (ns === "common") {
     return `export default {
-  welcome: "\u6B22\u8FCE\u4F7F\u7528",
-  loading: "\u52A0\u8F7D\u4E2D...",
-  confirm: "\u786E\u5B9A",
-  cancel: "\u53D6\u6D88",
-  save: "\u4FDD\u5B58",
-  delete: "\u5220\u9664",
-  edit: "\u7F16\u8F91",
-  back: "\u8FD4\u56DE",
+  welcome: '\u6B22\u8FCE\u4F7F\u7528',
+  loading: '\u52A0\u8F7D\u4E2D...',
+  confirm: '\u786E\u5B9A',
+  cancel: '\u53D6\u6D88',
+  save: '\u4FDD\u5B58',
+  delete: '\u5220\u9664',
+  edit: '\u7F16\u8F91',
+  back: '\u8FD4\u56DE',
 } as const;
 `;
   }
   return `export default {
-  title: "${ns}",
+  title: '${ns}',
 } as const;
 `;
 }
@@ -668,11 +668,11 @@ function scaffoldResourcesFile(cwd, sourceDir, _namespaces, locales, defaultLoca
   const parentDir = join3(cwd, sourceDir, "..");
   const filePath = join3(parentDir, "resources.ts");
   if (existsSync3(filePath)) return;
-  const content = `import resources from "./default";
+  const content = `import type resources from './default';
 
-export const DEFAULT_LOCALE = "${defaultLocale}";
+export const DEFAULT_LOCALE = '${defaultLocale}';
 
-export const SUPPORTED_LOCALES = ${JSON.stringify(locales)} as const;
+export const SUPPORTED_LOCALES = [${locales.map((l) => `'${l}'`).join(", ")}] as const;
 
 export type SupportedLocale = (typeof SUPPORTED_LOCALES)[number];
 
@@ -684,7 +684,7 @@ export const normalizeLocale = (locale?: string): SupportedLocale => {
   if (!locale) return DEFAULT_LOCALE as SupportedLocale;
 
   for (const l of SUPPORTED_LOCALES) {
-    if (l.startsWith(locale) || locale.startsWith(l.split("-")[0])) {
+    if (l.startsWith(locale) || locale.startsWith(l.split('-')[0])) {
       return l;
     }
   }
@@ -692,11 +692,9 @@ export const normalizeLocale = (locale?: string): SupportedLocale => {
   return DEFAULT_LOCALE as SupportedLocale;
 };
 
-export const localeOptions = ${JSON.stringify(
-    locales.map((l) => ({ value: l, label: getLocaleLabel(l) })),
-    null,
-    2
-  )} as const;
+export const localeOptions = [
+${locales.map((l) => `  { value: '${l}', label: '${getLocaleLabel(l)}' },`).join("\n")}
+] as const;
 `;
   writeFileSync2(filePath, content, "utf-8");
   logger.info(`\u5DF2\u751F\u6210\u7C7B\u578B\u6587\u4EF6: ${sourceDir}/../resources.ts`);
@@ -721,29 +719,29 @@ function getLocaleLabel(locale) {
 }
 function scaffoldConvertScript(cwd, sourceDir, localesDir, defaultLocale, logger) {
   const scriptsDir = join3(cwd, "scripts");
-  const scriptPath = join3(scriptsDir, "i18n-gen.js");
-  if (existsSync3(scriptPath)) return;
+  const scriptPath = join3(scriptsDir, "i18n-gen.cjs");
+  if (existsSync3(scriptPath) || existsSync3(join3(scriptsDir, "i18n-gen.js"))) return;
   if (!existsSync3(scriptsDir)) {
     mkdirSync(scriptsDir, { recursive: true });
   }
-  const content = `const fs = require("fs");
-const path = require("path");
+  const content = `const fs = require('node:fs');
+const path = require('node:path');
 
-const sourceDir = path.join(__dirname, "../${sourceDir}");
-const targetDir = path.join(__dirname, "../${localesDir}/${defaultLocale}");
+const sourceDir = path.join(__dirname, '../${sourceDir}');
+const targetDir = path.join(__dirname, '../${localesDir}/${defaultLocale}');
 
 const files = fs
   .readdirSync(sourceDir)
-  .filter((file) => file.endsWith(".ts") && file !== "index.ts")
-  .map((file) => path.basename(file, ".ts"));
+  .filter((file) => file.endsWith('.ts') && file !== 'index.ts')
+  .map((file) => path.basename(file, '.ts'));
 
-require("ts-node/register");
+require('ts-node/register');
 
 if (!fs.existsSync(targetDir)) {
   fs.mkdirSync(targetDir, { recursive: true });
 }
 
-console.log("\u5F00\u59CB\u8F6C\u6362 TypeScript \u6587\u4EF6\u5230 JSON...\\n");
+console.log('\u5F00\u59CB\u8F6C\u6362 TypeScript \u6587\u4EF6\u5230 JSON...\\n');
 
 files.forEach((fileName) => {
   try {
@@ -752,28 +750,28 @@ files.forEach((fileName) => {
     const moduleContent = require(modulePath).default;
     const jsonContent = JSON.stringify(moduleContent, null, 2);
     const targetPath = path.join(targetDir, \`\${fileName}.json\`);
-    fs.writeFileSync(targetPath, jsonContent, "utf8");
+    fs.writeFileSync(targetPath, jsonContent, 'utf8');
     console.log(\`  \${fileName}.ts \u2192 \${fileName}.json\`);
   } catch (error) {
     console.error(\`  \u8F6C\u6362 \${fileName}.ts \u5931\u8D25:\`, error.message);
   }
 });
 
-console.log("\\n\u8F6C\u6362\u5B8C\u6210\uFF01");
+console.log('\\n\u8F6C\u6362\u5B8C\u6210\uFF01');
 `;
   writeFileSync2(scriptPath, content, "utf-8");
-  logger.info("\u5DF2\u751F\u6210\u8F6C\u6362\u811A\u672C: scripts/i18n-gen.js");
+  logger.info("\u5DF2\u751F\u6210\u8F6C\u6362\u811A\u672C: scripts/i18n-gen.cjs");
 }
 function scaffoldI18nRc(cwd, localesDir, defaultLocale, locales, logger) {
   const filePath = join3(cwd, ".i18nrc.js");
   if (existsSync3(filePath)) return;
-  const outputLocales = locales.filter((l) => l !== defaultLocale).map((l) => `"${l}"`).join(", ");
-  const content = `const { defineConfig } = require("@4399ywkf/i18n");
+  const outputLocales = locales.filter((l) => l !== defaultLocale).map((l) => `'${l}'`).join(", ");
+  const content = `const { defineConfig } = require('@4399ywkf/i18n');
 
 module.exports = defineConfig({
-  entry: "${localesDir}/${defaultLocale}",
-  entryLocale: "${defaultLocale}",
-  output: "${localesDir}",
+  entry: '${localesDir}/${defaultLocale}',
+  entryLocale: '${defaultLocale}',
+  output: '${localesDir}',
   outputLocales: [${outputLocales}],
 });
 `;
@@ -792,15 +790,16 @@ function scaffoldLocaleJsonDirs(cwd, localesDir, locales, defaultLocale, namespa
       const filePath = join3(localeDir, `${ns}.json`);
       if (!existsSync3(filePath)) {
         const placeholder = ns === "common" ? JSON.stringify(
+          // 键按字母序排列，与 @4399ywkf/lint 的 Prettier（prettier-plugin-sort-json）一致
           {
-            welcome: "Welcome",
-            loading: "Loading...",
-            confirm: "OK",
+            back: "Back",
             cancel: "Cancel",
-            save: "Save",
+            confirm: "OK",
             delete: "Delete",
             edit: "Edit",
-            back: "Back"
+            loading: "Loading...",
+            save: "Save",
+            welcome: "Welcome"
           },
           null,
           2