@dune2/cli 0.3.3 → 0.3.4

package/dist/{chunk-5FXMC2FS.js → chunk-5DY6NAWS.js}

@@ -1,6 +1,6 @@
 import {
   normalizeConfig
-} from "./chunk-T2XO6ALS.js";
+} from "./chunk-XQ6ITMHY.js";
 
 // src/shared/index.ts
 import cac from "cac";
@@ -248,4 +248,4 @@ export {
   configName,
   getConfig
 };
-//# sourceMappingURL=chunk-5FXMC2FS.js.map
+//# sourceMappingURL=chunk-5DY6NAWS.js.map

package/dist/{chunk-T2XO6ALS.js → chunk-XQ6ITMHY.js}

@@ -1,3 +1,6 @@
+// src/shared/config/normalizeConfig.ts
+import path from "path";
+
 // src/shared/resolveSheetId.ts
 import { match } from "path-to-regexp";
 function resolveSheetId(str) {
@@ -13,7 +16,6 @@ function resolveSheetId(str) {
 }
 
 // src/shared/config/normalizeConfig.ts
-import path from "path";
 function normalizeConfig(config) {
   var _a;
   const defaultI18nConfig = {
@@ -32,9 +34,7 @@ function normalizeConfig(config) {
     item.cwd ??= config.cwd;
     item.locales = Object.keys(item.position).filter((item2) => item2 !== "key");
     item.sheetId = resolveSheetId(item.sheetId);
-    item.keySorter = (a, b) => {
-      return a.localeCompare(b);
-    };
+    item.keySorter = defaultKeySorter;
     item.enabled ??= true;
     item.namespaceSeparator ??= ".";
     return item;
@@ -58,10 +58,14 @@ function apiConfigNormalizer(item) {
   };
   return item;
 }
+var defaultKeySorter = (a, b) => {
+  return a.localeCompare(b, "en");
+};
 
 export {
   resolveSheetId,
   normalizeConfig,
-  apiConfigNormalizer
+  apiConfigNormalizer,
+  defaultKeySorter
 };
-//# sourceMappingURL=chunk-T2XO6ALS.js.map
+//# sourceMappingURL=chunk-XQ6ITMHY.js.map

package/dist/chunk-XQ6ITMHY.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/config/normalizeConfig.ts","../src/shared/resolveSheetId.ts"],"sourcesContent":["import path from \"path\";\nimport { resolveSheetId } from \"../resolveSheetId\";\nimport { ApiConfig, Config, I18nConfig } from \"./types\";\nexport function normalizeConfig(config: Config): Config {\n  const defaultI18nConfig: I18nConfig = {\n    i18nDir: \"./src/i18n\",\n    i18nFileName: \"{locale}.i18n.json\",\n    position: { key: \"B\", zh: \"C\", en: \"D\", in: \"E\" },\n    parseStartIndex: 2,\n  };\n  config.cwd ??= process.cwd();\n  config.cacheDir ??= path.join(config.cwd, \"node_modules/.cache/dune-cli\");\n\n  //#region i18n 配置标准化\n  if (!config.i18n || !config.i18n?.length) {\n    config.i18n = [defaultI18nConfig];\n  }\n\n  // 格式化 i18n 配置\n  config.i18n = config.i18n.map((item) => {\n    item = Object.assign({}, defaultI18nConfig, item);\n    item.cwd ??= config.cwd;\n    item.locales = Object.keys(item.position!).filter((item) => item !== \"key\");\n    item.sheetId = resolveSheetId(item.sheetId);\n    item.keySorter = defaultKeySorter;\n    item.enabled ??= true;\n\n    //#region namespace\n    item.namespaceSeparator ??= \".\";\n    //#endregion\n    return item;\n  });\n  //#endregion\n\n  //#region api 配置标准化\n  config.api ??= [];\n  config.api = config.api.map(apiConfigNormalizer);\n  //#endregion\n  return config;\n}\nexport function apiConfigNormalizer(item: ApiConfig) {\n  item.output ??= \"./src/apis\";\n  // 没有配置 urlTransformer 时，给 requestFnImportPath 赋默认值\n  // 优先使用 urlTransformer\n  if (!item.urlTransformer) {\n    item.requestFnImportPath ??= `import requestFn from '@/utils/request';`;\n  }\n  item.RequestBuilderImportPath ??= `import { RequestBuilder } from '@dune2/tools';`;\n  item.enableTs ??= true;\n  item.enabled ??= true;\n  item.format ??= true;\n  item.responseSchemaTransformer ??= (schema) =>\n    schema.properties?.data ?? schema;\n  return item;\n}\n\n/**\n * 默认的 key 排序函数\n */\nexport const defaultKeySorter = (a: string, b: string) => {\n  return a.localeCompare(b, \"en\");\n};\n","/**\n * input:\n *      \"https://docs.google.com/spreadsheets/d/1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk/edit#gid=1740568548\"\n * output:\n *      \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * --\n * input: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * output: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n */\nimport { match } from \"path-to-regexp\";\n\nexport function resolveSheetId(str?: string) {\n  if (!str || !str?.startsWith(\"http\")) {\n    return str;\n  }\n  const url = new URL(str);\n  const matched = match<{ id: string[] }>(\"/spreadsheets/d/:id*\", {\n    decode: decodeURIComponent,\n  })(url.pathname);\n  return matched ? matched.params.id?.[0] : str;\n}\n"],"mappings":";AAAA,OAAO,UAAU;;;ACSjB,SAAS,aAAa;AAEf,SAAS,eAAe,KAAc;AAX7C;AAYE,MAAI,CAAC,OAAO,EAAC,2BAAK,WAAW,UAAS;AACpC,WAAO;AAAA,EACT;AACA,QAAM,MAAM,IAAI,IAAI,GAAG;AACvB,QAAM,UAAU,MAAwB,wBAAwB;AAAA,IAC9D,QAAQ;AAAA,EACV,CAAC,EAAE,IAAI,QAAQ;AACf,SAAO,WAAU,aAAQ,OAAO,OAAf,mBAAoB,KAAK;AAC5C;;;ADjBO,SAAS,gBAAgB,QAAwB;AAHxD;AAIE,QAAM,oBAAgC;AAAA,IACpC,SAAS;AAAA,IACT,cAAc;AAAA,IACd,UAAU,EAAE,KAAK,KAAK,IAAI,KAAK,IAAI,KAAK,IAAI,IAAI;AAAA,IAChD,iBAAiB;AAAA,EACnB;AACA,SAAO,QAAQ,QAAQ,IAAI;AAC3B,SAAO,aAAa,KAAK,KAAK,OAAO,KAAK,8BAA8B;AAGxE,MAAI,CAAC,OAAO,QAAQ,GAAC,YAAO,SAAP,mBAAa,SAAQ;AACxC,WAAO,OAAO,CAAC,iBAAiB;AAAA,EAClC;AAGA,SAAO,OAAO,OAAO,KAAK,IAAI,CAAC,SAAS;AACtC,WAAO,OAAO,OAAO,CAAC,GAAG,mBAAmB,IAAI;AAChD,SAAK,QAAQ,OAAO;AACpB,SAAK,UAAU,OAAO,KAAK,KAAK,QAAS,EAAE,OAAO,CAACA,UAASA,UAAS,KAAK;AAC1E,SAAK,UAAU,eAAe,KAAK,OAAO;AAC1C,SAAK,YAAY;AACjB,SAAK,YAAY;AAGjB,SAAK,uBAAuB;AAE5B,WAAO;AAAA,EACT,CAAC;AAID,SAAO,QAAQ,CAAC;AAChB,SAAO,MAAM,OAAO,IAAI,IAAI,mBAAmB;AAE/C,SAAO;AACT;AACO,SAAS,oBAAoB,MAAiB;AACnD,OAAK,WAAW;AAGhB,MAAI,CAAC,KAAK,gBAAgB;AACxB,SAAK,wBAAwB;AAAA,EAC/B;AACA,OAAK,6BAA6B;AAClC,OAAK,aAAa;AAClB,OAAK,YAAY;AACjB,OAAK,WAAW;AAChB,OAAK,8BAA8B,CAAC,WAAQ;AAnD9C;AAoDI,yBAAO,eAAP,mBAAmB,SAAQ;AAAA;AAC7B,SAAO;AACT;AAKO,IAAM,mBAAmB,CAAC,GAAW,MAAc;AACxD,SAAO,EAAE,cAAc,GAAG,IAAI;AAChC;","names":["item"]}

package/dist/cli.js

@@ -6,8 +6,8 @@ import {
   getConfig,
   googleSheet,
   letterToNumber
-} from "./chunk-5FXMC2FS.js";
-import "./chunk-T2XO6ALS.js";
+} from "./chunk-5DY6NAWS.js";
+import "./chunk-XQ6ITMHY.js";
 
 // src/commands/extract.ts
 import fs2 from "fs-extra";
@@ -811,7 +811,7 @@ async function upload() {
 }
 
 // package.json
-var version = "0.3.2";
+var version = "0.3.3";
 
 // src/commands/interactive.ts
 import enquirer2 from "enquirer";

package/dist/index.js

@@ -5,10 +5,10 @@ import {
   googleSheet,
   letterToNumber,
   numberToLetter
-} from "./chunk-5FXMC2FS.js";
+} from "./chunk-5DY6NAWS.js";
 import {
   resolveSheetId
-} from "./chunk-T2XO6ALS.js";
+} from "./chunk-XQ6ITMHY.js";
 export {
   configName,
   defineConfig,

package/dist/normalizeConfig.d.ts

@@ -3,5 +3,9 @@ import 'openapi-types';
 
 declare function normalizeConfig(config: Config): Config;
 declare function apiConfigNormalizer(item: ApiConfig): ApiConfig;
+/**
+ * 默认的 key 排序函数
+ */
+declare const defaultKeySorter: (a: string, b: string) => number;
 
-export { apiConfigNormalizer, normalizeConfig };
+export { apiConfigNormalizer, defaultKeySorter, normalizeConfig };

package/dist/normalizeConfig.js

@@ -1,9 +1,11 @@
 import {
   apiConfigNormalizer,
+  defaultKeySorter,
   normalizeConfig
-} from "./chunk-T2XO6ALS.js";
+} from "./chunk-XQ6ITMHY.js";
 export {
   apiConfigNormalizer,
+  defaultKeySorter,
   normalizeConfig
 };
 //# sourceMappingURL=normalizeConfig.js.map

package/dist/prettier.cjs

@@ -0,0 +1,51 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/prettier.ts
+var _parserbabel = require('prettier/parser-babel');
+
+// src/shared/resolveSheetId.ts
+var _pathtoregexp = require('path-to-regexp');
+
+// src/shared/config/normalizeConfig.ts
+var defaultKeySorter = (a, b) => {
+  return a.localeCompare(b, "en");
+};
+
+// src/prettier.ts
+var i18nJsonExt = ".i18n.json";
+var jsonParser = _parserbabel.parsers.json;
+var languages = [
+  {
+    name: "dune-i18n-json",
+    parsers: ["json"],
+    extensions: [i18nJsonExt]
+  }
+];
+var parsers = {
+  json: {
+    ...jsonParser,
+    preprocess(text, options) {
+      if (jsonParser.preprocess) {
+        text = jsonParser.preprocess(text, options);
+      }
+      const isI18nJson = options.filepath.endsWith(i18nJsonExt);
+      if (isI18nJson) {
+        try {
+          let obj = JSON.parse(text);
+          let keys = Object.keys(obj).sort(defaultKeySorter);
+          let newObj = {};
+          keys.forEach((key) => {
+            newObj[key] = obj[key];
+          });
+          text = JSON.stringify(newObj, null, 2);
+        } catch (error) {
+          console.log(`JSON \u683C\u5F0F\u9519\u8BEF\uFF1A${error}`);
+        }
+      }
+      return text;
+    }
+  }
+};
+
+
+
+exports.languages = languages; exports.parsers = parsers;
+//# sourceMappingURL=prettier.cjs.map

package/dist/prettier.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/prettier.ts","../src/shared/resolveSheetId.ts","../src/shared/config/normalizeConfig.ts"],"names":[],"mappings":";AACA,SAAS,WAAW,uBAAuB;;;ACQ3C,SAAS,aAAa;;;ACkDf,IAAM,mBAAmB,CAAC,GAAW,MAAc;AACxD,SAAO,EAAE,cAAc,GAAG,IAAI;AAChC;;;AFzDA,IAAM,cAAc;AAEpB,IAAM,aAAa,gBAAgB;AAG5B,IAAM,YAAiC;AAAA,EAC5C;AAAA,IACE,MAAM;AAAA,IACN,SAAS,CAAC,MAAM;AAAA,IAChB,YAAY,CAAC,WAAW;AAAA,EAC1B;AACF;AAQO,IAAM,UAA6B;AAAA,EACxC,MAAM;AAAA,IACJ,GAAG;AAAA,IACH,WAAW,MAAM,SAAS;AACxB,UAAI,WAAW,YAAY;AACzB,eAAO,WAAW,WAAW,MAAM,OAAO;AAAA,MAC5C;AAEA,YAAM,aAAa,QAAQ,SAAS,SAAS,WAAW;AACxD,UAAI,YAAY;AACd,YAAI;AACF,cAAI,MAAM,KAAK,MAAM,IAAI;AACzB,cAAI,OAAO,OAAO,KAAK,GAAG,EAAE,KAAK,gBAAgB;AACjD,cAAI,SAAS,CAAC;AACd,eAAK,QAAQ,CAAC,QAAQ;AACpB,mBAAO,OAAO,IAAI;AAAA,UACpB,CAAC;AACD,iBAAO,KAAK,UAAU,QAAQ,MAAM,CAAC;AAAA,QACvC,SAAS,OAAP;AACA,kBAAQ,IAAI,sCAAa,OAAO;AAAA,QAClC;AAAA,MACF;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF","sourcesContent":["import { Plugin } from \"prettier\";\nimport { parsers as prettierParsers } from \"prettier/parser-babel\";\nimport { defaultKeySorter } from \"./shared/config/normalizeConfig\";\n\nconst i18nJsonExt = \".i18n.json\";\n\nconst jsonParser = prettierParsers.json;\n\n// 配置 i18n.json\nexport const languages: Plugin[\"languages\"] = [\n  {\n    name: \"dune-i18n-json\",\n    parsers: [\"json\"],\n    extensions: [i18nJsonExt],\n  },\n];\n\n/**\n * 格式化 *.i18n.json 文件\n * 按照 key 排序\n * 对齐 cli 生成的 i18n.json 文件顺序\n * 方便查看和比较\n */\nexport const parsers: Plugin[\"parsers\"] = {\n  json: {\n    ...jsonParser,\n    preprocess(text, options) {\n      if (jsonParser.preprocess) {\n        text = jsonParser.preprocess(text, options);\n      }\n\n      const isI18nJson = options.filepath.endsWith(i18nJsonExt);\n      if (isI18nJson) {\n        try {\n          let obj = JSON.parse(text);\n          let keys = Object.keys(obj).sort(defaultKeySorter);\n          let newObj = {};\n          keys.forEach((key) => {\n            newObj[key] = obj[key];\n          });\n          text = JSON.stringify(newObj, null, 2);\n        } catch (error) {\n          console.log(`JSON 格式错误：${error}`);\n        }\n      }\n      return text;\n    },\n  },\n};\n","/**\n * input:\n *      \"https://docs.google.com/spreadsheets/d/1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk/edit#gid=1740568548\"\n * output:\n *      \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * --\n * input: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * output: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n */\nimport { match } from \"path-to-regexp\";\n\nexport function resolveSheetId(str?: string) {\n  if (!str || !str?.startsWith(\"http\")) {\n    return str;\n  }\n  const url = new URL(str);\n  const matched = match<{ id: string[] }>(\"/spreadsheets/d/:id*\", {\n    decode: decodeURIComponent,\n  })(url.pathname);\n  return matched ? matched.params.id?.[0] : str;\n}\n","import path from \"path\";\nimport { resolveSheetId } from \"../resolveSheetId\";\nimport { ApiConfig, Config, I18nConfig } from \"./types\";\nexport function normalizeConfig(config: Config): Config {\n  const defaultI18nConfig: I18nConfig = {\n    i18nDir: \"./src/i18n\",\n    i18nFileName: \"{locale}.i18n.json\",\n    position: { key: \"B\", zh: \"C\", en: \"D\", in: \"E\" },\n    parseStartIndex: 2,\n  };\n  config.cwd ??= process.cwd();\n  config.cacheDir ??= path.join(config.cwd, \"node_modules/.cache/dune-cli\");\n\n  //#region i18n 配置标准化\n  if (!config.i18n || !config.i18n?.length) {\n    config.i18n = [defaultI18nConfig];\n  }\n\n  // 格式化 i18n 配置\n  config.i18n = config.i18n.map((item) => {\n    item = Object.assign({}, defaultI18nConfig, item);\n    item.cwd ??= config.cwd;\n    item.locales = Object.keys(item.position!).filter((item) => item !== \"key\");\n    item.sheetId = resolveSheetId(item.sheetId);\n    item.keySorter = defaultKeySorter;\n    item.enabled ??= true;\n\n    //#region namespace\n    item.namespaceSeparator ??= \".\";\n    //#endregion\n    return item;\n  });\n  //#endregion\n\n  //#region api 配置标准化\n  config.api ??= [];\n  config.api = config.api.map(apiConfigNormalizer);\n  //#endregion\n  return config;\n}\nexport function apiConfigNormalizer(item: ApiConfig) {\n  item.output ??= \"./src/apis\";\n  // 没有配置 urlTransformer 时，给 requestFnImportPath 赋默认值\n  // 优先使用 urlTransformer\n  if (!item.urlTransformer) {\n    item.requestFnImportPath ??= `import requestFn from '@/utils/request';`;\n  }\n  item.RequestBuilderImportPath ??= `import { RequestBuilder } from '@dune2/tools';`;\n  item.enableTs ??= true;\n  item.enabled ??= true;\n  item.format ??= true;\n  item.responseSchemaTransformer ??= (schema) =>\n    schema.properties?.data ?? schema;\n  return item;\n}\n\n/**\n * 默认的 key 排序函数\n */\nexport const defaultKeySorter = (a: string, b: string) => {\n  return a.localeCompare(b, \"en\");\n};\n"]}

package/dist/prettier.d.ts

@@ -0,0 +1,12 @@
+import { Plugin } from 'prettier';
+
+declare const languages: Plugin["languages"];
+/**
+ * 格式化 *.i18n.json 文件
+ * 按照 key 排序
+ * 对齐 cli 生成的 i18n.json 文件顺序
+ * 方便查看和比较
+ */
+declare const parsers: Plugin["parsers"];
+
+export { languages, parsers };

package/dist/prettier.js

@@ -0,0 +1,51 @@
+// src/prettier.ts
+import { parsers as prettierParsers } from "prettier/parser-babel";
+
+// src/shared/resolveSheetId.ts
+import { match } from "path-to-regexp";
+
+// src/shared/config/normalizeConfig.ts
+var defaultKeySorter = (a, b) => {
+  return a.localeCompare(b, "en");
+};
+
+// src/prettier.ts
+var i18nJsonExt = ".i18n.json";
+var jsonParser = prettierParsers.json;
+var languages = [
+  {
+    name: "dune-i18n-json",
+    parsers: ["json"],
+    extensions: [i18nJsonExt]
+  }
+];
+var parsers = {
+  json: {
+    ...jsonParser,
+    preprocess(text, options) {
+      if (jsonParser.preprocess) {
+        text = jsonParser.preprocess(text, options);
+      }
+      const isI18nJson = options.filepath.endsWith(i18nJsonExt);
+      if (isI18nJson) {
+        try {
+          let obj = JSON.parse(text);
+          let keys = Object.keys(obj).sort(defaultKeySorter);
+          let newObj = {};
+          keys.forEach((key) => {
+            newObj[key] = obj[key];
+          });
+          text = JSON.stringify(newObj, null, 2);
+        } catch (error) {
+          console.log(`JSON \u683C\u5F0F\u9519\u8BEF\uFF1A${error}`);
+        }
+      }
+      return text;
+    }
+  }
+};
+export {
+  languages,
+  parsers
+};
+//# sourceMappingURL=prettier.js.map

package/dist/prettier.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/prettier.ts","../src/shared/resolveSheetId.ts","../src/shared/config/normalizeConfig.ts"],"sourcesContent":["import { Plugin } from \"prettier\";\nimport { parsers as prettierParsers } from \"prettier/parser-babel\";\nimport { defaultKeySorter } from \"./shared/config/normalizeConfig\";\n\nconst i18nJsonExt = \".i18n.json\";\n\nconst jsonParser = prettierParsers.json;\n\n// 配置 i18n.json\nexport const languages: Plugin[\"languages\"] = [\n  {\n    name: \"dune-i18n-json\",\n    parsers: [\"json\"],\n    extensions: [i18nJsonExt],\n  },\n];\n\n/**\n * 格式化 *.i18n.json 文件\n * 按照 key 排序\n * 对齐 cli 生成的 i18n.json 文件顺序\n * 方便查看和比较\n */\nexport const parsers: Plugin[\"parsers\"] = {\n  json: {\n    ...jsonParser,\n    preprocess(text, options) {\n      if (jsonParser.preprocess) {\n        text = jsonParser.preprocess(text, options);\n      }\n\n      const isI18nJson = options.filepath.endsWith(i18nJsonExt);\n      if (isI18nJson) {\n        try {\n          let obj = JSON.parse(text);\n          let keys = Object.keys(obj).sort(defaultKeySorter);\n          let newObj = {};\n          keys.forEach((key) => {\n            newObj[key] = obj[key];\n          });\n          text = JSON.stringify(newObj, null, 2);\n        } catch (error) {\n          console.log(`JSON 格式错误：${error}`);\n        }\n      }\n      return text;\n    },\n  },\n};\n","/**\n * input:\n *      \"https://docs.google.com/spreadsheets/d/1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk/edit#gid=1740568548\"\n * output:\n *      \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * --\n * input: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * output: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n */\nimport { match } from \"path-to-regexp\";\n\nexport function resolveSheetId(str?: string) {\n  if (!str || !str?.startsWith(\"http\")) {\n    return str;\n  }\n  const url = new URL(str);\n  const matched = match<{ id: string[] }>(\"/spreadsheets/d/:id*\", {\n    decode: decodeURIComponent,\n  })(url.pathname);\n  return matched ? matched.params.id?.[0] : str;\n}\n","import path from \"path\";\nimport { resolveSheetId } from \"../resolveSheetId\";\nimport { ApiConfig, Config, I18nConfig } from \"./types\";\nexport function normalizeConfig(config: Config): Config {\n  const defaultI18nConfig: I18nConfig = {\n    i18nDir: \"./src/i18n\",\n    i18nFileName: \"{locale}.i18n.json\",\n    position: { key: \"B\", zh: \"C\", en: \"D\", in: \"E\" },\n    parseStartIndex: 2,\n  };\n  config.cwd ??= process.cwd();\n  config.cacheDir ??= path.join(config.cwd, \"node_modules/.cache/dune-cli\");\n\n  //#region i18n 配置标准化\n  if (!config.i18n || !config.i18n?.length) {\n    config.i18n = [defaultI18nConfig];\n  }\n\n  // 格式化 i18n 配置\n  config.i18n = config.i18n.map((item) => {\n    item = Object.assign({}, defaultI18nConfig, item);\n    item.cwd ??= config.cwd;\n    item.locales = Object.keys(item.position!).filter((item) => item !== \"key\");\n    item.sheetId = resolveSheetId(item.sheetId);\n    item.keySorter = defaultKeySorter;\n    item.enabled ??= true;\n\n    //#region namespace\n    item.namespaceSeparator ??= \".\";\n    //#endregion\n    return item;\n  });\n  //#endregion\n\n  //#region api 配置标准化\n  config.api ??= [];\n  config.api = config.api.map(apiConfigNormalizer);\n  //#endregion\n  return config;\n}\nexport function apiConfigNormalizer(item: ApiConfig) {\n  item.output ??= \"./src/apis\";\n  // 没有配置 urlTransformer 时，给 requestFnImportPath 赋默认值\n  // 优先使用 urlTransformer\n  if (!item.urlTransformer) {\n    item.requestFnImportPath ??= `import requestFn from '@/utils/request';`;\n  }\n  item.RequestBuilderImportPath ??= `import { RequestBuilder } from '@dune2/tools';`;\n  item.enableTs ??= true;\n  item.enabled ??= true;\n  item.format ??= true;\n  item.responseSchemaTransformer ??= (schema) =>\n    schema.properties?.data ?? schema;\n  return item;\n}\n\n/**\n * 默认的 key 排序函数\n */\nexport const defaultKeySorter = (a: string, b: string) => {\n  return a.localeCompare(b, \"en\");\n};\n"],"mappings":";AACA,SAAS,WAAW,uBAAuB;;;ACQ3C,SAAS,aAAa;;;ACkDf,IAAM,mBAAmB,CAAC,GAAW,MAAc;AACxD,SAAO,EAAE,cAAc,GAAG,IAAI;AAChC;;;AFzDA,IAAM,cAAc;AAEpB,IAAM,aAAa,gBAAgB;AAG5B,IAAM,YAAiC;AAAA,EAC5C;AAAA,IACE,MAAM;AAAA,IACN,SAAS,CAAC,MAAM;AAAA,IAChB,YAAY,CAAC,WAAW;AAAA,EAC1B;AACF;AAQO,IAAM,UAA6B;AAAA,EACxC,MAAM;AAAA,IACJ,GAAG;AAAA,IACH,WAAW,MAAM,SAAS;AACxB,UAAI,WAAW,YAAY;AACzB,eAAO,WAAW,WAAW,MAAM,OAAO;AAAA,MAC5C;AAEA,YAAM,aAAa,QAAQ,SAAS,SAAS,WAAW;AACxD,UAAI,YAAY;AACd,YAAI;AACF,cAAI,MAAM,KAAK,MAAM,IAAI;AACzB,cAAI,OAAO,OAAO,KAAK,GAAG,EAAE,KAAK,gBAAgB;AACjD,cAAI,SAAS,CAAC;AACd,eAAK,QAAQ,CAAC,QAAQ;AACpB,mBAAO,OAAO,IAAI;AAAA,UACpB,CAAC;AACD,iBAAO,KAAK,UAAU,QAAQ,MAAM,CAAC;AAAA,QACvC,SAAS,OAAP;AACA,kBAAQ,IAAI,sCAAa,OAAO;AAAA,QAClC;AAAA,MACF;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dune2/cli",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "type": "module",
   "exports": {
     ".": {
@@ -12,6 +12,10 @@
     "./normalizeConfig": {
       "import": "./dist/normalizeConfig.js"
     },
+    "./prettier": {
+      "import": "./dist/prettier.js",
+      "require": "./dist/prettier.cjs"
+    },
     "./package.json": "./package.json"
   },
   "types": "dist/index.d.ts",
@@ -23,7 +27,7 @@
   ],
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@dune2/wasm": "0.3.2",
+    "@dune2/wasm": "0.3.3",
     "cac": "^6.7.14",
     "cli-table3": "^0.6.3",
     "connect": "^3.7.0",
@@ -52,7 +56,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsup --clean --splitting",
+    "build": "shx rm -rf ./dist && tsup --splitting",
     "dev": "pnpm run build --watch",
     "lint": "tsc --diagnostics --noEmit",
     "test": "vitest run",

package/dist/chunk-T2XO6ALS.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/shared/resolveSheetId.ts","../src/shared/config/normalizeConfig.ts"],"sourcesContent":["/**\n * input:\n *      \"https://docs.google.com/spreadsheets/d/1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk/edit#gid=1740568548\"\n * output:\n *      \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * --\n * input: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n * output: \"1C9-Dol3oO20W9_FhiVlxNsDhOaaejJIgAZYRkonGmfk\"\n */\nimport { match } from \"path-to-regexp\";\n\nexport function resolveSheetId(str?: string) {\n  if (!str || !str?.startsWith(\"http\")) {\n    return str;\n  }\n  const url = new URL(str);\n  const matched = match<{ id: string[] }>(\"/spreadsheets/d/:id*\", {\n    decode: decodeURIComponent,\n  })(url.pathname);\n  return matched ? matched.params.id?.[0] : str;\n}\n","import { ApiConfig, Config, I18nConfig } from \"./types\";\nimport { resolveSheetId } from \"../resolveSheetId\";\nimport path from \"path\";\nexport function normalizeConfig(config: Config): Config {\n  const defaultI18nConfig: I18nConfig = {\n    i18nDir: \"./src/i18n\",\n    i18nFileName: \"{locale}.i18n.json\",\n    position: { key: \"B\", zh: \"C\", en: \"D\", in: \"E\" },\n    parseStartIndex: 2,\n  };\n  config.cwd ??= process.cwd();\n  config.cacheDir ??= path.join(config.cwd, \"node_modules/.cache/dune-cli\");\n\n  //#region i18n 配置标准化\n  if (!config.i18n || !config.i18n?.length) {\n    config.i18n = [defaultI18nConfig];\n  }\n\n  // 格式化 i18n 配置\n  config.i18n = config.i18n.map((item) => {\n    item = Object.assign({}, defaultI18nConfig, item);\n    item.cwd ??= config.cwd;\n    item.locales = Object.keys(item.position!).filter((item) => item !== \"key\");\n    item.sheetId = resolveSheetId(item.sheetId);\n    item.keySorter = (a, b) => {\n      return a.localeCompare(b);\n    };\n    item.enabled ??= true;\n\n    //#region namespace\n    item.namespaceSeparator ??= \".\";\n    //#endregion\n    return item;\n  });\n  //#endregion\n\n  //#region api 配置标准化\n  config.api ??= [];\n  config.api = config.api.map(apiConfigNormalizer);\n  //#endregion\n  return config;\n}\nexport function apiConfigNormalizer(item: ApiConfig) {\n  item.output ??= \"./src/apis\";\n  // 没有配置 urlTransformer 时，给 requestFnImportPath 赋默认值\n  // 优先使用 urlTransformer\n  if (!item.urlTransformer) {\n    item.requestFnImportPath ??= `import requestFn from '@/utils/request';`;\n  }\n  item.RequestBuilderImportPath ??= `import { RequestBuilder } from '@dune2/tools';`;\n  item.enableTs ??= true;\n  item.enabled ??= true;\n  item.format ??= true;\n  item.responseSchemaTransformer ??= (schema) =>\n    schema.properties?.data ?? schema;\n  return item;\n}\n"],"mappings":";AASA,SAAS,aAAa;AAEf,SAAS,eAAe,KAAc;AAX7C;AAYE,MAAI,CAAC,OAAO,EAAC,2BAAK,WAAW,UAAS;AACpC,WAAO;AAAA,EACT;AACA,QAAM,MAAM,IAAI,IAAI,GAAG;AACvB,QAAM,UAAU,MAAwB,wBAAwB;AAAA,IAC9D,QAAQ;AAAA,EACV,CAAC,EAAE,IAAI,QAAQ;AACf,SAAO,WAAU,aAAQ,OAAO,OAAf,mBAAoB,KAAK;AAC5C;;;AClBA,OAAO,UAAU;AACV,SAAS,gBAAgB,QAAwB;AAHxD;AAIE,QAAM,oBAAgC;AAAA,IACpC,SAAS;AAAA,IACT,cAAc;AAAA,IACd,UAAU,EAAE,KAAK,KAAK,IAAI,KAAK,IAAI,KAAK,IAAI,IAAI;AAAA,IAChD,iBAAiB;AAAA,EACnB;AACA,SAAO,QAAQ,QAAQ,IAAI;AAC3B,SAAO,aAAa,KAAK,KAAK,OAAO,KAAK,8BAA8B;AAGxE,MAAI,CAAC,OAAO,QAAQ,GAAC,YAAO,SAAP,mBAAa,SAAQ;AACxC,WAAO,OAAO,CAAC,iBAAiB;AAAA,EAClC;AAGA,SAAO,OAAO,OAAO,KAAK,IAAI,CAAC,SAAS;AACtC,WAAO,OAAO,OAAO,CAAC,GAAG,mBAAmB,IAAI;AAChD,SAAK,QAAQ,OAAO;AACpB,SAAK,UAAU,OAAO,KAAK,KAAK,QAAS,EAAE,OAAO,CAACA,UAASA,UAAS,KAAK;AAC1E,SAAK,UAAU,eAAe,KAAK,OAAO;AAC1C,SAAK,YAAY,CAAC,GAAG,MAAM;AACzB,aAAO,EAAE,cAAc,CAAC;AAAA,IAC1B;AACA,SAAK,YAAY;AAGjB,SAAK,uBAAuB;AAE5B,WAAO;AAAA,EACT,CAAC;AAID,SAAO,QAAQ,CAAC;AAChB,SAAO,MAAM,OAAO,IAAI,IAAI,mBAAmB;AAE/C,SAAO;AACT;AACO,SAAS,oBAAoB,MAAiB;AACnD,OAAK,WAAW;AAGhB,MAAI,CAAC,KAAK,gBAAgB;AACxB,SAAK,wBAAwB;AAAA,EAC/B;AACA,OAAK,6BAA6B;AAClC,OAAK,aAAa;AAClB,OAAK,YAAY;AACjB,OAAK,WAAW;AAChB,OAAK,8BAA8B,CAAC,WAAQ;AArD9C;AAsDI,yBAAO,eAAP,mBAAmB,SAAQ;AAAA;AAC7B,SAAO;AACT;","names":["item"]}