@wener/common 1.0.3 → 1.0.5

package/lib/tools/generateSchema.js

@@ -0,0 +1,43 @@
+import { exec } from "node:child_process";
+import fs from "node:fs/promises";
+import path from "node:path";
+import * as Codegen from "@sinclair/typebox-codegen";
+export async function generateSchema({ file, dir = path.dirname(file) }) {
+    const fn = path.basename(file).replace(/\.d\.ts$/, '.ts');
+    const types = await fs.readFile(file, 'utf-8');
+    const typeboxDir = path.join(dir, 'typebox');
+    const zodDir = path.join(dir, 'zod');
+    await fs.mkdir(typeboxDir, {
+        recursive: true
+    });
+    await fs.mkdir(zodDir, {
+        recursive: true
+    });
+    const typeBoxFile = path.join(typeboxDir, fn);
+    const zodFile = path.join(zodDir, fn);
+    {
+        // avoid import type error
+        let out = Codegen.TypeScriptToTypeBox.Generate(types);
+        out = out.replace(/^import \{ Type, Static\b/, `import { Type, type Static`);
+        await fs.writeFile(typeBoxFile, out);
+    }
+    const model = Codegen.TypeScriptToModel.Generate(types);
+    await fs.writeFile(zodFile, Codegen.ModelToZod.Generate(model));
+    await new Promise((resolve, reject)=>{
+        exec(`pnpm prettier --write "${dir}/{typebox,zod}/*.ts"`, (error, stdout, stderr)=>{
+            if (error) {
+                console.error(`exec error: ${error}`);
+                reject(error);
+                return;
+            }
+            resolve({
+                stderr,
+                stdout
+            });
+            stdout && console.log(`prettier:stdout: ${stdout}`);
+            stderr && console.error(`prettier:stderr: ${stderr}`);
+        });
+    });
+}
+
+//# sourceMappingURL=generateSchema.js.map

package/lib/tools/generateSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/tools/generateSchema.ts"],"sourcesContent":["import { exec } from 'node:child_process';\nimport fs from 'node:fs/promises';\nimport path from 'node:path';\nimport * as Codegen from '@sinclair/typebox-codegen';\n\nexport async function generateSchema({ file, dir = path.dirname(file) }: { file: string; dir?: string }) {\n  const fn = path.basename(file).replace(/\\.d\\.ts$/, '.ts');\n  const types = await fs.readFile(file, 'utf-8');\n\n  const typeboxDir = path.join(dir, 'typebox');\n  const zodDir = path.join(dir, 'zod');\n\n  await fs.mkdir(typeboxDir, { recursive: true });\n  await fs.mkdir(zodDir, { recursive: true });\n\n  const typeBoxFile = path.join(typeboxDir, fn);\n  const zodFile = path.join(zodDir, fn);\n  {\n    // avoid import type error\n    let out = Codegen.TypeScriptToTypeBox.Generate(types);\n    out = out.replace(/^import \\{ Type, Static\\b/, `import { Type, type Static`);\n    await fs.writeFile(typeBoxFile, out);\n  }\n  const model = Codegen.TypeScriptToModel.Generate(types);\n  await fs.writeFile(zodFile, Codegen.ModelToZod.Generate(model));\n\n  await new Promise((resolve, reject) => {\n    exec(`pnpm prettier --write \"${dir}/{typebox,zod}/*.ts\"`, (error, stdout, stderr) => {\n      if (error) {\n        console.error(`exec error: ${error}`);\n        reject(error);\n        return;\n      }\n      resolve({ stderr, stdout });\n      stdout && console.log(`prettier:stdout: ${stdout}`);\n      stderr && console.error(`prettier:stderr: ${stderr}`);\n    });\n  });\n}\n"],"names":["exec","fs","path","Codegen","generateSchema","file","dir","dirname","fn","basename","replace","types","readFile","typeboxDir","join","zodDir","mkdir","recursive","typeBoxFile","zodFile","out","TypeScriptToTypeBox","Generate","writeFile","model","TypeScriptToModel","ModelToZod","Promise","resolve","reject","error","stdout","stderr","console","log"],"mappings":"AAAA,SAASA,IAAI,QAAQ,qBAAqB;AAC1C,OAAOC,QAAQ,mBAAmB;AAClC,OAAOC,UAAU,YAAY;AAC7B,YAAYC,aAAa,4BAA4B;AAErD,OAAO,eAAeC,eAAe,EAAEC,IAAI,EAAEC,MAAMJ,KAAKK,OAAO,CAACF,KAAK,EAAkC;IACrG,MAAMG,KAAKN,KAAKO,QAAQ,CAACJ,MAAMK,OAAO,CAAC,YAAY;IACnD,MAAMC,QAAQ,MAAMV,GAAGW,QAAQ,CAACP,MAAM;IAEtC,MAAMQ,aAAaX,KAAKY,IAAI,CAACR,KAAK;IAClC,MAAMS,SAASb,KAAKY,IAAI,CAACR,KAAK;IAE9B,MAAML,GAAGe,KAAK,CAACH,YAAY;QAAEI,WAAW;IAAK;IAC7C,MAAMhB,GAAGe,KAAK,CAACD,QAAQ;QAAEE,WAAW;IAAK;IAEzC,MAAMC,cAAchB,KAAKY,IAAI,CAACD,YAAYL;IAC1C,MAAMW,UAAUjB,KAAKY,IAAI,CAACC,QAAQP;IAClC;QACE,0BAA0B;QAC1B,IAAIY,MAAMjB,QAAQkB,mBAAmB,CAACC,QAAQ,CAACX;QAC/CS,MAAMA,IAAIV,OAAO,CAAC,6BAA6B,CAAC,0BAA0B,CAAC;QAC3E,MAAMT,GAAGsB,SAAS,CAACL,aAAaE;IAClC;IACA,MAAMI,QAAQrB,QAAQsB,iBAAiB,CAACH,QAAQ,CAACX;IACjD,MAAMV,GAAGsB,SAAS,CAACJ,SAAShB,QAAQuB,UAAU,CAACJ,QAAQ,CAACE;IAExD,MAAM,IAAIG,QAAQ,CAACC,SAASC;QAC1B7B,KAAK,CAAC,uBAAuB,EAAEM,IAAI,oBAAoB,CAAC,EAAE,CAACwB,OAAOC,QAAQC;YACxE,IAAIF,OAAO;gBACTG,QAAQH,KAAK,CAAC,CAAC,YAAY,EAAEA,OAAO;gBACpCD,OAAOC;gBACP;YACF;YACAF,QAAQ;gBAAEI;gBAAQD;YAAO;YACzBA,UAAUE,QAAQC,GAAG,CAAC,CAAC,iBAAiB,EAAEH,QAAQ;YAClDC,UAAUC,QAAQH,KAAK,CAAC,CAAC,iBAAiB,EAAEE,QAAQ;QACtD;IACF;AACF"}

package/lib/tools/renderJsonSchemaToMarkdownDoc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tools/renderJsonSchemaToMarkdownDoc.ts"],"sourcesContent":["import type { TObject, TSchema } from '@sinclair/typebox';\n\nexport function renderJsonSchemaToMarkdownDoc(rootSchema: any) {\n  // markdown\n  const out: string[] = [];\n  const all = new Set();\n  const pending: TSchema[] = [];\n\n  const addObject = (o: TSchema) => {\n    if (all.has(o.$id)) {\n      return;\n    }\n    all.add(o.$id);\n    pending.push(o);\n  };\n\n  const writeObjectProps = (T: TObject, { prefix = '' }: { prefix?: string } = {}) => {\n    if (!T?.properties) {\n      return;\n    }\n    for (const [name, schema] of Object.entries(T.properties)) {\n      let typ = schema.$id || schema.type;\n\n      if (typ === 'array') {\n        typ = `${schema.items.$id || schema.items.type}[]`;\n        if (schema.items.$id) {\n          addObject(schema.items);\n        }\n      } else if (schema.$id) {\n        addObject(schema);\n      }\n      if (!typ) {\n        if ('anyOf' in schema) {\n          typ = 'enum';\n        }\n      }\n\n      out.push(`| ${prefix}${name} | ${typ} | ${schema.title || schema.description || ''} |`);\n\n      if (typ === 'object') {\n        writeObjectProps(schema as TObject, { prefix: `${prefix}${name}.` });\n      } else if (schema.type === 'array') {\n        if (schema.items.type === 'object' && !schema.items.$id) {\n          writeObjectProps(schema.items as TObject, { prefix: `${prefix}${name}[].` });\n        }\n      }\n    }\n  };\n  const writeObject = (T: TObject) => {\n    out.push(`### ${T.title || T.$id}`);\n    out.push(`\n| $id | 名字 |\n| --- | --- |\n| ${T.$id || ''} | ${T.title || ''} | \n    `);\n    if (T.description) {\n      out.push('');\n      out.push(`> ${T.description}`);\n      out.push('');\n    }\n\n    out.push(`| 名字 | 类型 | 说明 |`);\n    out.push(`| --- | --- | --- |`);\n\n    writeObjectProps(T);\n\n    out.push('');\n  };\n\n  writeObject(rootSchema);\n\n  for (const schema of pending) {\n    if (schema.type === 'object') {\n      writeObject(schema as TObject);\n    } else if ('anyOf' in schema) {\n      out.push(`### ${schema.$id || schema.title}`);\n      out.push(`\n| $id | 名字 |\n| --- | --- |\n| ${schema.$id || ''} | ${schema.title || ''} | \n    `);\n\n      out.push(`| 值 |  说明 |`);\n      out.push(`| --- | --- |`);\n      for (const item of schema.anyOf) {\n        out.push(`| ${item.const} | ${item.title || item.description || ''} |`);\n      }\n      out.push('');\n    }\n  }\n\n  return out.join('\\n');\n}\n"],"names":["renderJsonSchemaToMarkdownDoc","rootSchema","out","all","Set","pending","addObject","o","has","$id","add","push","writeObjectProps","T","prefix","properties","name","schema","Object","entries","typ","type","items","title","description","writeObject","item","anyOf","const","join"],"mappings":"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"}
+{"version":3,"sources":["../../src/tools/renderJsonSchemaToMarkdownDoc.ts"],"sourcesContent":["import type { TObject, TSchema } from '@sinclair/typebox';\n\nexport function renderJsonSchemaToMarkdownDoc(rootSchema: any) {\n\t// markdown\n\tconst out: string[] = [];\n\tconst all = new Set();\n\tconst pending: TSchema[] = [];\n\n\tconst addObject = (o: TSchema) => {\n\t\tif (all.has(o.$id)) {\n\t\t\treturn;\n\t\t}\n\t\tall.add(o.$id);\n\t\tpending.push(o);\n\t};\n\n\tconst writeObjectProps = (T: TObject, { prefix = '' }: { prefix?: string } = {}) => {\n\t\tif (!T?.properties) {\n\t\t\treturn;\n\t\t}\n\t\tfor (const [name, schema] of Object.entries(T.properties)) {\n\t\t\tlet typ = schema.$id || schema.type;\n\n\t\t\tif (typ === 'array') {\n\t\t\t\ttyp = `${schema.items.$id || schema.items.type}[]`;\n\t\t\t\tif (schema.items.$id) {\n\t\t\t\t\taddObject(schema.items);\n\t\t\t\t}\n\t\t\t} else if (schema.$id) {\n\t\t\t\taddObject(schema);\n\t\t\t}\n\t\t\tif (!typ) {\n\t\t\t\tif ('anyOf' in schema) {\n\t\t\t\t\ttyp = 'enum';\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tout.push(`| ${prefix}${name} | ${typ} | ${schema.title || schema.description || ''} |`);\n\n\t\t\tif (typ === 'object') {\n\t\t\t\twriteObjectProps(schema as TObject, { prefix: `${prefix}${name}.` });\n\t\t\t} else if (schema.type === 'array') {\n\t\t\t\tif (schema.items.type === 'object' && !schema.items.$id) {\n\t\t\t\t\twriteObjectProps(schema.items as TObject, { prefix: `${prefix}${name}[].` });\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t};\n\tconst writeObject = (T: TObject) => {\n\t\tout.push(`### ${T.title || T.$id}`);\n\t\tout.push(`\n| $id | 名字 |\n| --- | --- |\n| ${T.$id || ''} | ${T.title || ''} | \n    `);\n\t\tif (T.description) {\n\t\t\tout.push('');\n\t\t\tout.push(`> ${T.description}`);\n\t\t\tout.push('');\n\t\t}\n\n\t\tout.push(`| 名字 | 类型 | 说明 |`);\n\t\tout.push(`| --- | --- | --- |`);\n\n\t\twriteObjectProps(T);\n\n\t\tout.push('');\n\t};\n\n\twriteObject(rootSchema);\n\n\tfor (const schema of pending) {\n\t\tif (schema.type === 'object') {\n\t\t\twriteObject(schema as TObject);\n\t\t} else if ('anyOf' in schema) {\n\t\t\tout.push(`### ${schema.$id || schema.title}`);\n\t\t\tout.push(`\n| $id | 名字 |\n| --- | --- |\n| ${schema.$id || ''} | ${schema.title || ''} | \n    `);\n\n\t\t\tout.push(`| 值 |  说明 |`);\n\t\t\tout.push(`| --- | --- |`);\n\t\t\tfor (const item of schema.anyOf) {\n\t\t\t\tout.push(`| ${item.const} | ${item.title || item.description || ''} |`);\n\t\t\t}\n\t\t\tout.push('');\n\t\t}\n\t}\n\n\treturn out.join('\\n');\n}\n"],"names":["renderJsonSchemaToMarkdownDoc","rootSchema","out","all","Set","pending","addObject","o","has","$id","add","push","writeObjectProps","T","prefix","properties","name","schema","Object","entries","typ","type","items","title","description","writeObject","item","anyOf","const","join"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wener/common",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "description": "",
   "author": "",
@@ -14,6 +14,14 @@
       "types": "./src/cn/index.ts",
       "default": "./lib/cn/index.js"
     },
+    "./consola": {
+      "types": "./src/consola/index.ts",
+      "default": "./lib/consola/index.js"
+    },
+    "./data": {
+      "types": "./src/data/index.ts",
+      "default": "./lib/data/index.js"
+    },
     "./jsonschema": {
       "types": "./src/jsonschema/index.ts",
       "default": "./lib/jsonschema/index.js"
@@ -40,12 +48,15 @@
   ],
   "keywords": [],
   "dependencies": {
-    "es-toolkit": "^1.31.0",
-    "ts-pattern": "^5.6.0",
+    "es-toolkit": "^1.32.0",
+    "std-env": "^3.8.1",
+    "ts-pattern": "^5.6.2",
+    "zod": "^3.24.2",
     "@wener/utils": "1.1.51"
   },
   "devDependencies": {
-    "@sinclair/typebox": "^0.34.13",
+    "@sinclair/typebox": "^0.34.28",
+    "@sinclair/typebox-codegen": "^0.10.5",
     "@types/argon2-browser": "^1.18.4",
     "@types/bcrypt": "^5.0.2",
     "@types/bcryptjs": "^2.4.6",
@@ -56,7 +67,10 @@
     "argon2": "^0.41.1",
     "argon2-browser": "^1.18.0",
     "bcrypt": "^5.1.1",
-    "bcryptjs": "^2.4.3"
+    "bcryptjs": "^3.0.2",
+    "chalk": "^5.4.1",
+    "consola": "^3.4.2",
+    "dayjs": "^1.11.13"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/cn/DivisionCode.test.ts

@@ -2,49 +2,42 @@ import { describe, expect, it } from 'vitest';
 import { DivisionCode } from './DivisionCode';
 
 describe('DivisionCode', () => {
-  it('should parse', () => {
-    for (const [a, b] of [
-      [
-        '441900003001',
-        {
-          province: '44',
-          city: '19',
-          county: '00',
-          town: '003',
-          village: '001',
-          codes: ['44', '19', '00', '003', '001'],
-        },
-      ],
-      [
-        441900003001,
-        {
-          province: '44',
-          city: '19',
-          county: '00',
-          town: '003',
-          village: '001',
-          codes: ['44', '19', '00', '003', '001'],
-        },
-      ],
-      [
-        441900,
-        {
-          province: '44',
-          city: '19',
-          county: '00',
-        },
-      ],
-      ['31', { province: '31' }],
-      ['4', undefined],
-      ['', undefined],
-      [null, undefined],
-      [undefined, undefined],
-    ] as Array<[string, any]>) {
-      let out = DivisionCode.parse(a);
-      expect(out).toMatchObject(b);
-      if (out) {
-        expect(DivisionCode.format(out)).toBe(String(a));
-      }
-    }
-  });
+	it('should parse', () => {
+		for (const [a, b] of [
+			[
+				'441900003001',
+				{
+					province: '44',
+					city: '19',
+					county: '00',
+					town: '003',
+					village: '001',
+					codes: ['44', '19', '00', '003', '001'],
+				},
+			],
+			[
+				441900003001,
+				{
+					province: '44',
+					city: '19',
+					county: '00',
+					town: '003',
+					village: '001',
+					codes: ['44', '19', '00', '003', '001'],
+				},
+			],
+			[441900, { province: '44', city: '19', county: '00' }],
+			['31', { province: '31' }],
+			['4', undefined],
+			['', undefined],
+			[null, undefined],
+			[undefined, undefined],
+		] as Array<[string, any]>) {
+			let out = DivisionCode.parse(a);
+			expect(out).toMatchObject(b);
+			if (out) {
+				expect(DivisionCode.format(out)).toBe(String(a));
+			}
+		}
+	});
 });

package/src/cn/DivisionCode.ts

@@ -1,45 +1,9 @@
-const DivisionCodeLevels: Array<{
-  level: number;
-  code: string;
-  length: number;
-  size: number;
-  label: string;
-}> = [
-  {
-    level: 1,
-    code: 'Province',
-    length: 2,
-    size: 2,
-    label: '省',
-  },
-  {
-    level: 2,
-    code: 'City',
-    length: 4,
-    size: 2,
-    label: '市',
-  },
-  {
-    level: 3,
-    code: 'County',
-    length: 6,
-    size: 2,
-    label: '区县',
-  },
-  {
-    level: 4,
-    code: 'Town',
-    length: 9,
-    size: 3,
-    label: '乡镇',
-  },
-  {
-    level: 5,
-    code: 'Village',
-    length: 12,
-    size: 3,
-    label: '村',
-  },
+const DivisionCodeLevels: Array<{ level: number; code: string; length: number; size: number; label: string }> = [
+	{ level: 1, code: 'Province', length: 2, size: 2, label: '省' },
+	{ level: 2, code: 'City', length: 4, size: 2, label: '市' },
+	{ level: 3, code: 'County', length: 6, size: 2, label: '区县' },
+	{ level: 4, code: 'Town', length: 9, size: 3, label: '乡镇' },
+	{ level: 5, code: 'Village', length: 12, size: 3, label: '村' },
 ] as const;
 
 // String(Number.MAX_SAFE_INTEGER).length=16
@@ -51,128 +15,120 @@ const DivisionCodeLevels: Array<{
  * @see https://zh.wikipedia.org/wiki/GB/T_2260 中华人民共和国行政区划代码
  */
 export namespace DivisionCode {
-  enum DivisionCodeLevel {
-    Province = 1,
-    City = 2,
-    County = 3,
-    Town = 4,
-    Village = 5,
-  }
-
-  export const levels = DivisionCodeLevels;
-
-  export const regex = /^(?<province>\d{2})(?<city>\d{2})?(?<county>\d{2})?(?<town>\d{3})?(?<village>\d{3})?$/;
-
-  const root: CodeValue[] = [
-    { value: '11', label: '北京市' },
-    { value: '12', label: '天津市' },
-    { value: '13', label: '河北省' },
-    { value: '14', label: '山西省' },
-    { value: '15', label: '内蒙古自治区' },
-    { value: '21', label: '辽宁省' },
-    { value: '22', label: '吉林省' },
-    { value: '23', label: '黑龙江省' },
-    { value: '31', label: '上海市' },
-    { value: '32', label: '江苏省' },
-    { value: '33', label: '浙江省' },
-    { value: '34', label: '安徽省' },
-    { value: '35', label: '福建省' },
-    { value: '36', label: '江西省' },
-    { value: '37', label: '山东省' },
-    { value: '41', label: '河南省' },
-    { value: '42', label: '湖北省' },
-    { value: '43', label: '湖南省' },
-    { value: '44', label: '广东省' },
-    { value: '45', label: '广西壮族自治区' },
-    { value: '46', label: '海南省' },
-    { value: '50', label: '重庆市' },
-    { value: '51', label: '四川省' },
-    { value: '52', label: '贵州省' },
-    { value: '53', label: '云南省' },
-    { value: '54', label: '西藏自治区' },
-    { value: '61', label: '陕西省' },
-    { value: '62', label: '甘肃省' },
-    { value: '63', label: '青海省' },
-    { value: '64', label: '宁夏回族自治区' },
-    { value: '65', label: '新疆维吾尔自治区' },
-    { value: '71', label: '台湾省' },
-    { value: '81', label: '香港特别行政区' },
-    { value: '82', label: '澳门特别行政区' },
-    // 9 国外
-  ];
-
-  export type ParsedCode = {
-    province: string;
-    city?: string;
-    county?: string;
-    town?: string;
-    village?: string;
-    codes: string[];
-    level: DivisionCodeLevel;
-    labels: string[];
-  };
-
-  export function parse(code: string | undefined | null | number): ParsedCode | undefined {
-    if (!code) return;
-    code = String(code);
-    const match = regex.exec(code);
-    if (!match) return;
-    const { province, city, county, town, village } = match.groups ?? {};
-    if (!province) return;
-
-    let codes = [province, city, county, town, village].filter(Boolean);
-    return {
-      province,
-      city,
-      county,
-      town,
-      village,
-      codes: codes,
-      level: codes.length as DivisionCodeLevel,
-    };
-  }
-
-  export function format({
-    province,
-    city,
-    county,
-    town,
-    village,
-  }: {
-    province: string | number;
-    city?: string | number;
-    county?: string | number;
-    town?: string | number;
-    village?: string | number;
-  }): string {
-    const codes: string[] = [];
-    for (let i = 0; i < [province, city, county, town, village].length; i++) {
-      let x = [province, city, county, town, village][i];
-      if (x === undefined || x === null || x === '') {
-        break;
-      }
-      let len = levels[i].size;
-      codes.push(String(x).padStart(len, '0').slice(0, len));
-    }
-    return codes.join('');
-  }
-
-  // export function random(level: DivisionCodeLevel = 'County'): string {
-  //   const l = DivisionCodeLevels.find((v) => v.code === level) || DivisionCodeLevels[2];
-  //   const l1 = randomPick(provinces);
-  //   if (l.level === 1) {
-  //     return String(l1[0]);
-  //   }
-  //   return l1 + String(Math.floor(Math.random() * parseFloat(`1e${l.length - 2}`) - 1));
-  // }
+	enum DivisionCodeLevel {
+		Province = 1,
+		City = 2,
+		County = 3,
+		Town = 4,
+		Village = 5,
+	}
+
+	export const levels = DivisionCodeLevels;
+
+	export const regex = /^(?<province>\d{2})(?<city>\d{2})?(?<county>\d{2})?(?<town>\d{3})?(?<village>\d{3})?$/;
+
+	const root: CodeValue[] = [
+		{ value: '11', label: '北京市' },
+		{ value: '12', label: '天津市' },
+		{ value: '13', label: '河北省' },
+		{ value: '14', label: '山西省' },
+		{ value: '15', label: '内蒙古自治区' },
+		{ value: '21', label: '辽宁省' },
+		{ value: '22', label: '吉林省' },
+		{ value: '23', label: '黑龙江省' },
+		{ value: '31', label: '上海市' },
+		{ value: '32', label: '江苏省' },
+		{ value: '33', label: '浙江省' },
+		{ value: '34', label: '安徽省' },
+		{ value: '35', label: '福建省' },
+		{ value: '36', label: '江西省' },
+		{ value: '37', label: '山东省' },
+		{ value: '41', label: '河南省' },
+		{ value: '42', label: '湖北省' },
+		{ value: '43', label: '湖南省' },
+		{ value: '44', label: '广东省' },
+		{ value: '45', label: '广西壮族自治区' },
+		{ value: '46', label: '海南省' },
+		{ value: '50', label: '重庆市' },
+		{ value: '51', label: '四川省' },
+		{ value: '52', label: '贵州省' },
+		{ value: '53', label: '云南省' },
+		{ value: '54', label: '西藏自治区' },
+		{ value: '61', label: '陕西省' },
+		{ value: '62', label: '甘肃省' },
+		{ value: '63', label: '青海省' },
+		{ value: '64', label: '宁夏回族自治区' },
+		{ value: '65', label: '新疆维吾尔自治区' },
+		{ value: '71', label: '台湾省' },
+		{ value: '81', label: '香港特别行政区' },
+		{ value: '82', label: '澳门特别行政区' },
+		// 9 国外
+	];
+
+	export type ParsedCode = {
+		province: string;
+		city?: string;
+		county?: string;
+		town?: string;
+		village?: string;
+		codes: string[];
+		level: DivisionCodeLevel;
+		labels: string[];
+	};
+
+	export function parse(code: string | undefined | null | number): ParsedCode | undefined {
+		if (!code) return;
+		code = String(code);
+		const match = regex.exec(code);
+		if (!match) return;
+		const { province, city, county, town, village } = match.groups ?? {};
+		if (!province) return;
+
+		let codes = [province, city, county, town, village].filter(Boolean);
+		return { province, city, county, town, village, codes: codes, level: codes.length as DivisionCodeLevel };
+	}
+
+	export function format({
+		province,
+		city,
+		county,
+		town,
+		village,
+	}: {
+		province: string | number;
+		city?: string | number;
+		county?: string | number;
+		town?: string | number;
+		village?: string | number;
+	}): string {
+		const codes: string[] = [];
+		for (let i = 0; i < [province, city, county, town, village].length; i++) {
+			let x = [province, city, county, town, village][i];
+			if (x === undefined || x === null || x === '') {
+				break;
+			}
+			let len = levels[i].size;
+			codes.push(String(x).padStart(len, '0').slice(0, len));
+		}
+		return codes.join('');
+	}
+
+	// export function random(level: DivisionCodeLevel = 'County'): string {
+	//   const l = DivisionCodeLevels.find((v) => v.code === level) || DivisionCodeLevels[2];
+	//   const l1 = randomPick(provinces);
+	//   if (l.level === 1) {
+	//     return String(l1[0]);
+	//   }
+	//   return l1 + String(Math.floor(Math.random() * parseFloat(`1e${l.length - 2}`) - 1));
+	// }
 }
 
 interface DivisionTreeNode {
-  sub: string; // sub code
-  children?: Record<string, DivisionTreeNode>;
+	sub: string; // sub code
+	children?: Record<string, DivisionTreeNode>;
 
-  code: string; // full code
-  name?: string; // name of division
+	code: string; // full code
+	name?: string; // name of division
 }
 
 // export type DivisionCodeLevel = 'Village' | 'Town' | 'County' | 'City' | 'Province';
@@ -220,34 +176,34 @@ interface DivisionTreeNode {
 // }
 
 export function randomPick<T>(s: T[]) {
-  return s[Math.floor(Math.random() * s.length)];
+	return s[Math.floor(Math.random() * s.length)];
 }
 
 function lookup(opts: { values: string[]; root: CodeValue[] }): { found: CodeValue[] } {
-  const { values, root } = opts;
-  const found: CodeValue[] = [];
-  let currentLevel = root;
-
-  for (const v of values) {
-    const node = currentLevel.find((n) => n.value === v);
-    if (!node) {
-      break;
-    }
-
-    found.push(node);
-
-    if (node.children) {
-      currentLevel = node.children;
-    } else {
-      break;
-    }
-  }
-
-  return { found };
+	const { values, root } = opts;
+	const found: CodeValue[] = [];
+	let currentLevel = root;
+
+	for (const v of values) {
+		const node = currentLevel.find((n) => n.value === v);
+		if (!node) {
+			break;
+		}
+
+		found.push(node);
+
+		if (node.children) {
+			currentLevel = node.children;
+		} else {
+			break;
+		}
+	}
+
+	return { found };
 }
 
 interface CodeValue {
-  value: string;
-  label: string;
-  children?: Array<CodeValue>;
+	value: string;
+	label: string;
+	children?: Array<CodeValue>;
 }

package/src/cn/Mod11Checksum.ts

@@ -2,23 +2,23 @@
  * ISO 7064:1983, MOD 11-2.
  */
 export class Mod11Checksum {
-  weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2, 1];
+	weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2, 1];
 
-  validate(s: string) {
-    return s.at(-1) === this.compute(s.slice(0, s.length - 1));
-  }
+	validate(s: string) {
+		return s.at(-1) === this.compute(s.slice(0, s.length - 1));
+	}
 
-  compute(s: string) {
-    const { weights } = this;
-    let sum = 0;
-    for (let i = 0; i < s.length; i++) {
-      sum += parseInt(s[i]) * weights[i];
-    }
-    const num = (12 - (sum % 11)) % 11;
-    if (num < 10) {
-      return num.toString();
-    } else {
-      return 'X';
-    }
-  }
+	compute(s: string) {
+		const { weights } = this;
+		let sum = 0;
+		for (let i = 0; i < s.length; i++) {
+			sum += parseInt(s[i]) * weights[i];
+		}
+		const num = (12 - (sum % 11)) % 11;
+		if (num < 10) {
+			return num.toString();
+		} else {
+			return 'X';
+		}
+	}
 }