@dune2/cli 0.1.24 → 0.1.26

package/dist/cli.js

@@ -1,50 +1,23 @@
 #!/usr/bin/env node
 import {
+  cli,
   configName,
-  getConfig
-} from "./chunk-RADJ36VS.js";
+  createLogger,
+  getConfig,
+  googleSheet,
+  letterToNumber
+} from "./chunk-IPRK5TYY.js";
 
 // src/commands/extract.ts
-import fs3 from "fs-extra";
+import fs2 from "fs-extra";
 import { globby } from "globby";
 import pMap2 from "p-map";
 
-// src/shared/index.ts
-import cac from "cac";
-import debug from "debug";
-import path from "path";
-import fs from "fs-extra";
-var cli = cac("dune");
-var createLogger = (name) => {
-  const info = debug(`${cli.name}:${name}`);
-  return {
-    ...info,
-    info,
-    error: info.extend("error")
-  };
-};
-debug.enable(`${cli.name}:*`);
-var homeConfigDir = (() => {
-  const isWin = process.platform === "win32";
-  const USER_HOME_DIR = isWin ? process.env.USERPROFILE : process.env.HOME;
-  const configDir = path.join(USER_HOME_DIR, ".config", cli.name);
-  if (!fs.existsSync(configDir)) {
-    fs.mkdirSync(configDir);
-  }
-  return homeConfigDir2;
-  function homeConfigDir2(p) {
-    if (!p) {
-      return configDir;
-    }
-    return path.join(configDir, p);
-  }
-})();
-
 // src/shared/i18nData.ts
 import pMap from "p-map";
-import fs2 from "fs-extra";
+import fs from "fs-extra";
 import pc from "picocolors";
-import path2 from "path";
+import path from "path";
 import Table from "cli-table3";
 var log = createLogger("i18nData");
 var I18nData = class {
@@ -55,7 +28,7 @@ var I18nData = class {
     this.data = {};
     this.unUsedKeys = /* @__PURE__ */ new Set();
     this.isDefaultLocale = locale === config.defaultLocale;
-    this.filePath = path2.join(
+    this.filePath = path.join(
       config.cwd,
       config.i18nDir,
       config.i18nFileName.replace("{locale}", locale)
@@ -63,8 +36,8 @@ var I18nData = class {
   }
   async loadData() {
     try {
-      if (await fs2.pathExists(this.filePath)) {
-        this.data = await fs2.readJSON(this.filePath);
+      if (await fs.pathExists(this.filePath)) {
+        this.data = await fs.readJSON(this.filePath);
       } else {
         log.info("File '%s' does not exist", pc.dim(this.filePath));
       }
@@ -118,8 +91,8 @@ var I18nData = class {
       pc.dim(this.filePath)
     );
     try {
-      await fs2.ensureFile(this.filePath);
-      await fs2.writeJson(this.filePath, this.data, { spaces: 2 });
+      await fs.ensureFile(this.filePath);
+      await fs.writeJson(this.filePath, this.data, { spaces: 2 });
       log.info(
         "Saved i18n data for locale '%s' to file '%s'",
         pc.green(this.locale),
@@ -265,7 +238,7 @@ function promptApiConfigEnable(configArr) {
 }
 
 // src/commands/extract.ts
-import path3 from "path";
+import path2 from "path";
 var log2 = createLogger("extract");
 async function extract(opts) {
   const config = await getConfig();
@@ -288,7 +261,7 @@ async function extract(opts) {
     await pMap2(
       files,
       async (file) => {
-        const content = await fs3.readFile(file, "utf-8");
+        const content = await fs2.readFile(file, "utf-8");
         const res = await extract2(content, file);
         if (res.data.size) {
           log2.info(
@@ -303,7 +276,7 @@ async function extract(opts) {
               cur = { ...value, files: [] };
             }
             cur.files.push(res.filename);
-            cur.messages = cur.messages || value.messages;
+            cur.messages = value.messages || cur.messages;
             if (!hasCache) {
               extractedI18nDataMap.set(key, cur);
             }
@@ -330,9 +303,9 @@ async function extract(opts) {
   }
 }
 async function saveDebugLog(dir, extractedI18nDataMap) {
-  await fs3.ensureDirSync(dir);
-  await fs3.writeJSON(
-    path3.join(dir, "extractedI18nDataMap.json"),
+  await fs2.ensureDirSync(dir);
+  await fs2.writeJSON(
+    path2.join(dir, "extractedI18nDataMap.json"),
     Array.from(extractedI18nDataMap.entries()).map(([key, value]) => value),
     {
       spaces: 2
@@ -343,201 +316,8 @@ async function saveDebugLog(dir, extractedI18nDataMap) {
 // src/commands/download.ts
 import pMap3 from "p-map";
 
-// src/shared/google/sheet.ts
-import { google as google2 } from "googleapis";
-
-// src/shared/letters.ts
-function letterToNumber(letters) {
-  if (typeof letters === "number" || !Number.isNaN(+letters)) {
-    return +letters;
-  }
-  let n = 0;
-  letters = letters.toUpperCase();
-  for (let p = 0; p < letters.length; p++) {
-    n = letters[p].charCodeAt(0) - 64 + n * 26;
-  }
-  return Math.max(0, n - 1);
-}
-var alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-var base = alphabet.length;
-function numberToLetter(n) {
-  const digits = [];
-  do {
-    const v = n % base;
-    digits.push(v);
-    n = Math.floor(n / base);
-  } while (n-- > 0);
-  const chars = [];
-  while (digits.length) {
-    chars.push(alphabet[digits.pop()]);
-  }
-  return chars.join("");
-}
-
-// src/shared/google/auth.ts
-import fs4 from "fs-extra";
-import { google } from "googleapis";
-
-// src/shared/google/shared.ts
-import connect from "connect";
-import open from "open";
-import { URL } from "url";
-var log3 = createLogger("google:shared");
-function openBrowser(url) {
-  log3.info(`\u5982\u672A\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\uFF0C\u53EF\u8BBF\u95EE\u4EE5\u4E0B\u5730\u5740\uFF1A${url}`);
-  open(url, { app: { name: open.apps.chrome } });
-}
-function openAndWaitReturnQuery(toOpenUrl, port, queryKey) {
-  return new Promise((resolve) => {
-    openBrowser(toOpenUrl);
-    const app = connect();
-    app.use((req, res, next) => {
-      const parsedUrl = new URL(req.url, `http://localhost:${port}`);
-      const target = parsedUrl.searchParams.get(queryKey);
-      if (target) {
-        res.writeHead(200, {
-          "content-type": "text/html;charset=utf8"
-        });
-        res.end(
-          `<div>\u5F53\u524D\u7A97\u53E3\u53EF\u76F4\u63A5\u5173\u95ED</div>
-                  <script>
-                    window.open("", "_self", "");
-                    window.close();
-                  <\/script>`
-        );
-        server.close();
-        server.unref();
-        resolve(target);
-      }
-      next();
-    });
-    const server = app.listen(port);
-  });
-}
-
-// src/shared/google/auth.ts
-var log4 = createLogger("google:auth");
-var GoogleAuth = class {
-  constructor(options) {
-    this.options = options;
-    this.tokens = null;
-    this.tokensCachePath = homeConfigDir("chromeAuthToken.json");
-    this.oauth2Client = new google.auth.OAuth2(
-      this.options.client_id,
-      this.options.client_secret,
-      "http://localhost:12345"
-    );
-    this.initCredentialsPromise = null;
-    this.options.scope = this.options.scope ?? ["spreadsheets"];
-    const scopePrefix = `https://www.googleapis.com/auth/`;
-    this.scope = this.options.scope.map((item) => {
-      if (item.startsWith(scopePrefix)) {
-        return item;
-      }
-      return `${scopePrefix}${item}`;
-    });
-    try {
-      this.tokens = fs4.readJsonSync(this.tokensCachePath);
-    } catch (e) {
-      log4.info("\u672A\u83B7\u53D6\u5230\u7F13\u5B58\u7684token");
-      this.tokens = null;
-    }
-  }
-  async saveTokens(tokens) {
-    this.tokens = tokens;
-    await fs4.writeJSON(this.tokensCachePath, tokens);
-    log4.info("\u4FDD\u5B58token\u6210\u529F");
-  }
-  async getCode() {
-    log4.info("\u5C06\u6253\u5F00chrome\u6D4F\u89C8\u5668\u8FDB\u884C\u6388\u6743");
-    const authUrl = this.oauth2Client.generateAuthUrl({
-      access_type: "offline",
-      scope: this.scope
-    });
-    return await openAndWaitReturnQuery(authUrl, 12345, "code");
-  }
-  async initCredentialsImpl() {
-    if (!this.tokens) {
-      const code = await this.getCode();
-      const { tokens } = await this.oauth2Client.getToken(code);
-      await this.saveTokens(tokens);
-    }
-    this.oauth2Client.setCredentials(this.tokens);
-  }
-  async initCredentials() {
-    if (!this.initCredentialsPromise) {
-      this.initCredentialsPromise = this.initCredentialsImpl();
-    }
-    return await this.initCredentialsPromise;
-  }
-};
-var clientSecret = {
-  client_id: "467670582023-3sr5gnfsuebgtde1mk3vp78om43no4kv.apps.googleusercontent.com",
-  project_id: "dune-cli-376503",
-  auth_uri: "https://accounts.google.com/o/oauth2/auth",
-  token_uri: "https://oauth2.googleapis.com/token",
-  auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs",
-  client_secret: "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",
-  redirect_uris: ["http://localhost"],
-  javascript_origins: ["http://localhost"]
-};
-var googleAuth = new GoogleAuth(clientSecret);
-
-// src/shared/google/sheet.ts
-var log5 = createLogger("google:sheets");
-var GoogleSheet = class {
-  constructor() {
-    this.initPromise = null;
-    this.get = async (options) => {
-      await this.init();
-      return this.sheets.spreadsheets.values.get(options);
-    };
-  }
-  async initImpl() {
-    if (!this.sheets) {
-      await googleAuth.initCredentials();
-      this.sheets = google2.sheets({
-        version: "v4",
-        auth: googleAuth.oauth2Client
-      });
-    }
-  }
-  async init() {
-    if (!this.initPromise) {
-      this.initPromise = this.initImpl();
-    }
-    await this.initPromise;
-  }
-  async update(spreadsheetId, range, colIndex, rowIndex, values) {
-    await this.init();
-    const colLetter = numberToLetter(colIndex);
-    const sheetNeedRange = `${range}!${colLetter}${rowIndex}`;
-    const res = await this.sheets.spreadsheets.values.update({
-      spreadsheetId,
-      range: sheetNeedRange,
-      valueInputOption: "USER_ENTERED",
-      requestBody: { values }
-    });
-    if (res.status === 200) {
-      log5.info(`\u66F4\u65B0 ${sheetNeedRange} \u7684\u503C\u6210\u529F`);
-    } else {
-      log5.error("some thing wrong", res);
-    }
-    return res;
-  }
-  async updateCell(spreadsheetId, range, colIndex, rowIndex, values) {
-    return this.update(spreadsheetId, range, colIndex, rowIndex, [[values]]);
-  }
-  async updateColumn(spreadsheetId, range, colIndex, rowIndex, values) {
-    return this.update(spreadsheetId, range, colIndex, rowIndex, [
-      ...values.map((v) => [v])
-    ]);
-  }
-};
-var googleSheet = new GoogleSheet();
-
 // src/shared/resolveSheetData.ts
-var log6 = createLogger("shared:resolveSheetData");
+var log3 = createLogger("shared:resolveSheetData");
 var SheetI18nItem = class {
   constructor(spreadsheetId, range, key, colIndex, row, rowIndex) {
     this.spreadsheetId = spreadsheetId;
@@ -564,13 +344,13 @@ var SheetI18nItem = class {
 async function resolveSheetData(config) {
   const { position } = config;
   const parseStartIndex = config.parseStartIndex ?? 2;
-  log6.info(`\u8BFB\u53D6 ${config.sheetRange} sheet\u6570\u636E`);
+  log3.info(`\u8BFB\u53D6 ${config.sheetRange} sheet\u6570\u636E`);
   const res = await googleSheet.get({
     spreadsheetId: config.sheetId,
     range: config.sheetRange
   });
   if (!res.data.values) {
-    log6.error(
+    log3.error(
       `${config.sheetRange} sheet\u6570\u636E\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\uFF0C\u5E94\u8BE5\u6700\u5C11\u6709\u4E00\u884C\u5934\u90E8\u6570\u636E`
     );
     return new SheetData(config, 2);
@@ -585,7 +365,7 @@ async function resolveSheetData(config) {
     const i18nKey = row[letterToNumber(position.key)];
     if (i18nKey) {
       if (sheetData.keySet.has(i18nKey)) {
-        log6.error(
+        log3.error(
           `\u8868\u683C ${config.sheetRange} \u53D1\u73B0\u91CD\u590D\u7684i18nKey: ${i18nKey}, \u5C06\u8986\u76D6\u524D\u9762\u7684\u503C`
         );
       } else {
@@ -638,7 +418,7 @@ var SheetData = class {
 };
 
 // src/commands/download.ts
-var log7 = createLogger("generate");
+var log4 = createLogger("generate");
 async function download() {
   const config = await getConfig();
   let i18nConfigs = await promptI18nConfigEnable(config.i18n);
@@ -646,7 +426,7 @@ async function download() {
   for (const configItem of i18nConfigs) {
     i++;
     if (!configItem.sheetId || !configItem.sheetRange) {
-      log7.error(`config.${i} sheetId \u6216 sheetRange \u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5`);
+      log4.error(`config.${i} sheetId \u6216 sheetRange \u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5`);
       continue;
     }
     const sheetData = await resolveSheetData(configItem);
@@ -667,26 +447,26 @@ async function download() {
 import * as child_process from "child_process";
 import _ from "lodash";
 import pMap4 from "p-map";
-import fs5 from "fs-extra";
+import fs3 from "fs-extra";
 import * as os2 from "os";
 import SwaggerParser from "@apidevtools/swagger-parser";
 import { compile } from "json-schema-to-typescript";
-import path4 from "path";
-var log8 = createLogger("generateApi");
+import path3 from "path";
+var log5 = createLogger("generateApi");
 async function generateApi() {
   const config = await getConfig();
   const apiConfigs = await promptApiConfigEnable(config.api);
   for (const apiConfig of apiConfigs) {
-    log8.info(`\u6E05\u9664\u65E7\u7684api\u6587\u4EF6: ${apiConfig.output}`);
-    await fs5.emptydir(apiConfig.output);
+    log5.info(`\u6E05\u9664\u65E7\u7684api\u6587\u4EF6: ${apiConfig.output}`);
+    await fs3.emptydir(apiConfig.output);
   }
   for (const apiConfig of apiConfigs) {
-    log8.info("\u5F00\u59CB\u89E3\u6790 %s", apiConfig.swaggerJSONPath);
+    log5.info("\u5F00\u59CB\u89E3\u6790 %s", apiConfig.swaggerJSONPath);
     const parsed = await SwaggerParser.dereference(
       apiConfig.swaggerJSONPath
     );
     await pMap4(Object.entries(parsed.paths), async ([url, pathItemObject]) => {
-      log8.info("\u5F00\u59CB\u751F\u6210 %s", url);
+      log5.info("\u5F00\u59CB\u751F\u6210 %s", url);
       if (pathItemObject) {
         await pMap4(
           ["get", "put", "post", "delete", "patch"],
@@ -699,32 +479,32 @@ async function generateApi() {
                 operationObject,
                 apiConfig
               });
-              const outputPath = path4.join(
+              const outputPath = path3.join(
                 apiConfig.output,
                 url,
                 apiConfig.enableTs ? `${method}.ts` : `${method}.js`
               ).replace(/:/g, "_");
-              await fs5.ensureFile(outputPath);
-              await fs5.writeFile(outputPath, code);
+              await fs3.ensureFile(outputPath);
+              await fs3.writeFile(outputPath, code);
             }
           }
         );
       }
     });
     if (apiConfig.format) {
-      log8.info(`\u5C1D\u8BD5\u683C\u5F0F\u5316\u4EE3\u7801: %s`, apiConfig.output);
+      log5.info(`\u5C1D\u8BD5\u683C\u5F0F\u5316\u4EE3\u7801: %s`, apiConfig.output);
       child_process.exec(`prettier --write ${apiConfig.output}`, (error) => {
         if (error) {
-          log8.error(`\u683C\u5F0F\u5316\u4EE3\u7801\u5931\u8D25: ${error}`);
-          log8.error(`\u8BF7\u624B\u52A8\u6267\u884C: prettier --write ${apiConfig.output}`);
-          log8.error(`\u6216\u8005\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u5173\u95ED\u683C\u5F0F\u5316\u529F\u80FD`);
+          log5.error(`\u683C\u5F0F\u5316\u4EE3\u7801\u5931\u8D25: ${error}`);
+          log5.error(`\u8BF7\u624B\u52A8\u6267\u884C: prettier --write ${apiConfig.output}`);
+          log5.error(`\u6216\u8005\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u5173\u95ED\u683C\u5F0F\u5316\u529F\u80FD`);
         } else {
-          log8.info(`\u683C\u5F0F\u5316\u4EE3\u7801\u6210\u529F: %s`, apiConfig.output);
+          log5.info(`\u683C\u5F0F\u5316\u4EE3\u7801\u6210\u529F: %s`, apiConfig.output);
         }
       });
     }
   }
-  log8.info("generateApi Done");
+  log5.info("generateApi Done");
 }
 async function generateApiRequestCode(options) {
   var _a, _b;
@@ -831,7 +611,7 @@ async function compileRequestParams(operationObject) {
         additionalProperties: false
       });
     } catch (e) {
-      log8.error("\u751F\u6210\u8BF7\u6C42\u53C2\u6570\u7C7B\u578B\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 %o", {
+      log5.error("\u751F\u6210\u8BF7\u6C42\u53C2\u6570\u7C7B\u578B\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 %o", {
         summary: operationObject.summary,
         message: e.message
       });
@@ -856,13 +636,13 @@ async function compileResponseParams(operationObject, apiConfig) {
           additionalProperties: false
         });
       } catch (e) {
-        log8.error("\u8F6C\u6362\u54CD\u5E94\u53C2\u6570\u7C7B\u578B\u5931\u8D25, \u8BF7\u68C0\u67E5 %o", {
+        log5.error("\u8F6C\u6362\u54CD\u5E94\u53C2\u6570\u7C7B\u578B\u5931\u8D25, \u8BF7\u68C0\u67E5 %o", {
           summary: operationObject.summary,
           error: e.message
         });
       }
     } else {
-      log8.error("responseSchemaTransformer \u8FD4\u56DE\u503C\u4E3A\u7A7A, \u8BF7\u68C0\u67E5");
+      log5.error("responseSchemaTransformer \u8FD4\u56DE\u503C\u4E3A\u7A7A, \u8BF7\u68C0\u67E5");
     }
   }
   return code ? code : "export type Res = any;";
@@ -885,9 +665,9 @@ function markCircularToRef(obj, parentMark = "#", map = /* @__PURE__ */ new Map(
 }
 
 // src/commands/initConfig.ts
-import fs6 from "fs-extra";
-import path5 from "path";
-var log9 = createLogger("initConfig");
+import fs4 from "fs-extra";
+import path4 from "path";
+var log6 = createLogger("initConfig");
 var tpl = `/**
  * @template {import('@dune2/cli').Config} T
  * @param {T} config - A generic parameter that flows through to the return type
@@ -900,19 +680,19 @@ module.exports = defineConfig({ i18n: [], api:[] });
 `;
 var initConfig = async () => {
   const config = await getConfig();
-  const configPath = path5.join(config.cwd, configName);
-  log9.info(`config file path: ${configPath}`);
-  if (await fs6.pathExists(configPath)) {
-    log9.info(`config file already exists, skip`);
+  const configPath = path4.join(config.cwd, configName);
+  log6.info(`config file path: ${configPath}`);
+  if (await fs4.pathExists(configPath)) {
+    log6.info(`config file already exists, skip`);
     return;
   }
-  await fs6.writeFile(configPath, tpl);
-  log9.info(`config file created`);
+  await fs4.writeFile(configPath, tpl);
+  log6.info(`config file created`);
 };
 
 // src/commands/upload.ts
 import pMap5 from "p-map";
-var log10 = createLogger("upload");
+var log7 = createLogger("upload");
 async function batchUpdateKeys(config) {
   let sheetData = await resolveSheetData(config);
   const allKeys = [];
@@ -928,7 +708,7 @@ async function batchUpdateKeys(config) {
   });
   needSyncKeys = needSyncKeys.sort(config.keySorter);
   if (needSyncKeys.length) {
-    log10.info(`\u5373\u5C06\u540C\u6B65\u672C\u5730\u65B0\u589E\u52A0 ${needSyncKeys.length} \u4E2A i18nKey \u5230\u4E91\u7AEF`);
+    log7.info(`\u5373\u5C06\u540C\u6B65\u672C\u5730\u65B0\u589E\u52A0 ${needSyncKeys.length} \u4E2A i18nKey \u5230\u4E91\u7AEF`);
     await googleSheet.updateColumn(
       config.sheetId,
       config.sheetRange,
@@ -936,7 +716,7 @@ async function batchUpdateKeys(config) {
       sheetData.nextAppendRowIndex,
       needSyncKeys
     );
-    log10.info("\u540C\u6B65\u65B0\u589E\u52A0i18nKey\u6210\u529F");
+    log7.info("\u540C\u6B65\u65B0\u589E\u52A0i18nKey\u6210\u529F");
     for (const lang of config.locales) {
       const langFile = i18nDataMap.get(lang);
       const needSyncValues = [];
@@ -945,7 +725,7 @@ async function batchUpdateKeys(config) {
           needSyncValues.push(langFile.data[k]);
         }
       });
-      log10.info(
+      log7.info(
         `\u5373\u5C06\u540C\u6B65\u672C\u5730 ${lang} \u65B0\u589E\u52A0 ${needSyncValues.length} \u4E2A\u503C\u5230\u4E91\u7AEF`
       );
       await googleSheet.updateColumn(
@@ -958,7 +738,7 @@ async function batchUpdateKeys(config) {
     }
     await sleep(1e3);
     sheetData = await resolveSheetData(config);
-    log10.info(`\u5DF2\u91CD\u65B0\u83B7\u53D6 ${config.sheetRange} \u7684\u6570\u636E`);
+    log7.info(`\u5DF2\u91CD\u65B0\u83B7\u53D6 ${config.sheetRange} \u7684\u6570\u636E`);
   }
   return { sheetData, i18nDataMap };
 }
@@ -977,16 +757,16 @@ async function upload() {
       await i18nData.trySaveToGoogle(sheetData);
     });
   }
-  log10.info("\u4E0A\u4F20\u6210\u529F");
+  log7.info("\u4E0A\u4F20\u6210\u529F");
 }
 
 // package.json
-var version = "0.1.23";
+var version = "0.1.25";
 
 // src/commands/interactive.ts
 import enquirer2 from "enquirer";
 var { prompt: prompt2 } = enquirer2;
-var log11 = createLogger("interactive");
+var log8 = createLogger("interactive");
 var interactive = async (args) => {
   var _a;
   const commands = cli.commands.filter((command2) => {
@@ -1012,7 +792,7 @@ var interactive = async (args) => {
   });
   const command = commandMap.get(res.command);
   if (!command) {
-    log11.error("\u672A\u627E\u5230\u547D\u4EE4 %s", res.command);
+    log8.error("\u672A\u627E\u5230\u547D\u4EE4 %s", res.command);
     return;
   }
   (_a = command.commandAction) == null ? void 0 : _a.apply(cli, args);