@wener/common 1.0.5 → 2.0.2

package/src/cn/UnifiedSocialCreditCode.ts

@@ -1,143 +1,123 @@
-import { Mod31Checksum } from './Mod31Checksum';
+import { z } from 'zod/v4';
+import { Mod31 } from './Mod31';
 
-/**
- * 统一社会信用代码
- *
- * - GB 11714-1997 全国组织机构代码编制规则
- */
-export namespace UnifiedSocialCreditCode {
-	interface CodeValue {
-		label: string;
-		children?: Record<string, CodeValue>;
-	}
+interface CodeValue {
+	name: string;
+	children?: Record<string, CodeValue>;
+}
 
-	const CodeLabels: Record<string, CodeValue> = {
-		1: {
-			label: '机构编制',
-			children: {
-				1: { label: '机关' },
-				2: { label: '事业单位' },
-				3: { label: '中央编办直接管理机构编制的群众团体' },
-				9: { label: '其他' },
-			},
+const CodeNames: Record<string, CodeValue> = {
+	1: {
+		name: '机构编制',
+		children: {
+			1: { name: '机关' },
+			2: { name: '事业单位' },
+			3: { name: '中央编办直接管理机构编制的群众团体' },
+			9: { name: '其他' },
 		},
-		5: {
-			label: '民政',
-			children: {
-				1: { label: '社会团体' },
-				2: { label: '民办非企业单位' },
-				3: { label: '基金会' },
-				9: { label: '其他' },
-			},
+	},
+	5: {
+		name: '民政',
+		children: {
+			1: { name: '社会团体' },
+			2: { name: '民办非企业单位' },
+			3: { name: '基金会' },
+			9: { name: '其他' },
 		},
-		9: {
-			label: '工商',
-			children: {
-				1: { label: '企业' },
-				2: { label: '个体工商户' },
-				3: { label: '农民专业合作社' },
-				9: { label: '其他' },
-			},
+	},
+	9: {
+		name: '工商',
+		children: {
+			1: { name: '企业' },
+			2: { name: '个体工商户' },
+			3: { name: '农民专业合作社' },
+			9: { name: '其他' },
 		},
-		Y: { label: '其他', children: { 1: { label: '其他' } } },
-	};
+	},
+	Y: { name: '其他', children: { 1: { name: '其他' } } },
+};
 
-	export const pattern = /^([159][1239]|Y1)[0-9]{6}[0-9A-HJ-NP-RTUWXY]{10}$/; // 无 I O Z S V
+export type ParsedUnifiedSocialCreditCode = z.infer<typeof ParsedUnifiedSocialCreditCodeSchema>;
+export const ParsedUnifiedSocialCreditCodeSchema = z
+	.object({
+		raw: z.string().length(18).describe('统一社会信用代码'),
+		registrationAuthorityCode: z.string().length(1).describe('登记管理部门代码'),
+		entityCategoryCode: z.string().length(1).describe('机构类别代码'),
+		adminDivisionCode: z.string().length(6).describe('登记管理机关行政区划码 '),
+		organizationCode: z.string().length(9).describe('主体标识码/组织机构代码'),
+		checkDigit: z.string().length(1).describe('校验码'),
 
-	export const Checksum = new Mod31Checksum();
+		codes: z.string().array().describe('代码数组'),
+		names: z.string().array().describe('代码名称'),
+		valid: z.boolean().optional().describe('是否有效'),
+	})
+	.describe('统一社会信用代码');
 
-	export function parse(s: string): ParsedUnifiedSocialCreditCode {
-		let bureau = s[0];
-		let subjectType = s[1];
-		let division = s.slice(2, 8); // 第3~8位，共6位，正确
-		let subject = s.slice(8, 17); // 第9~17位，共9位
-		let checksum = s.slice(17, 18); // 第18位，校验码
+export const UnifiedSocialCreditCodeRegex = /^([159][1239]|Y1)[0-9]{6}[0-9A-HJ-NP-RTUWXY]{10}$/;
 
-		const labels: string[] = [];
-		let l1 = CodeLabels[bureau];
-		l1 && labels.push(l1?.label);
-		let l2 = l1?.children?.[subjectType];
-		l2 && labels.push(l2?.label);
+export function parseUnifiedSocialCreditCode(s: string): ParsedUnifiedSocialCreditCode | undefined {
+	if (!s || s.length !== 18) return undefined;
 
-		return {
-			bureau,
-			subjectType,
-			division,
-			subject,
-			checksum,
-			codes: [bureau, subjectType, division, subject],
-			labels,
-		};
-	}
+	const registrationAuthorityCode = s[0];
+	const entityCategoryCode = s[1];
+	const adminDivisionCode = s.slice(2, 8);
+	const organizationCode = s.slice(8, 17);
+	const checkDigit = s[17];
 
-	export function format({
-		bureau,
-		subjectType,
-		division,
-		subject,
-		checksum,
-	}: {
-		bureau: string;
-		subjectType: string;
-		division: string;
-		subject: string;
-		checksum?: string;
-	}): string {
-		const base = `${bureau}${subjectType}${division}${subject}`;
-		checksum ||= Checksum.compute(base);
-		return `${base}${checksum}`;
-	}
+	const codes = [registrationAuthorityCode, entityCategoryCode, adminDivisionCode, organizationCode, checkDigit];
+	const names: string[] = [];
 
-	export function next(s: string, delta: number = 1) {
-		const sp = s.split('').map((v) => Checksum.numbers[v]);
-		for (let i = sp.length - 1; i >= 0; i--) {
-			if ((delta > 0 && sp[i] < 30) || (delta < 0 && sp[i] > 0)) {
-				sp[i] += delta;
-				break;
-			} else if (delta > 0 && sp[i] === 30) {
-				sp[i] = 0;
-			} else if (delta < 0 && sp[i] === 0) {
-				sp[i] = 30;
-			}
+	const bureau = CodeNames[registrationAuthorityCode];
+	if (bureau) {
+		names.push(bureau.name);
+		const subject = bureau.children?.[entityCategoryCode];
+		if (subject) {
+			names.push(subject.name);
 		}
-		return sp.map((v) => Checksum.chars[v]).join('');
 	}
-}
-
-/**
- * 解析后的统一社会信用代码信息
- */
-interface ParsedUnifiedSocialCreditCode {
-	/**
-	 * @title 登记管理部门代码
-	 * 对应统一社会信用代码的第1位字符，用于标识发证机构类别（登记管理部门）。
-	 */
-	bureau: string;
 
-	/**
-	 * @title 机构类别代码
-	 * 对应统一社会信用代码的第2位字符，用于标识被赋码主体的类型（如企业、事业单位、社会组织等）。
-	 */
-	subjectType: string;
-
-	/**
-	 * @title 登记管理机关行政区划代码
-	 * 对应统一社会信用代码的第3至第8位字符，用于标识该主体登记机关所在的行政区划。
-	 */
-	division: string;
-
-	/**
-	 * @title 主体标识码
-	 * 对应统一社会信用代码的第9至第17位字符，用于标识特定的市场主体或法人单位。
-	 */
-	subject: string;
+	return {
+		raw: s,
+		registrationAuthorityCode,
+		entityCategoryCode,
+		adminDivisionCode,
+		organizationCode,
+		checkDigit,
+		codes,
+		names,
+		valid: UnifiedSocialCreditCodeRegex.test(s) && Mod31.validate(s),
+	};
+}
 
-	/**
-	 * @title 校验码
-	 * 对应统一社会信用代码的最后一位字符，用特定算法计算，用于校验代码有效性。
-	 */
-	checksum: string;
+export function formatUnifiedSocialCreditCode({
+	registrationAuthorityCode,
+	entityCategoryCode,
+	adminDivisionCode,
+	organizationCode,
+	checkDigit,
+}: {
+	registrationAuthorityCode: string;
+	entityCategoryCode: string;
+	adminDivisionCode: string;
+	organizationCode: string;
+	checkDigit?: string;
+}): string {
+	const base = `${registrationAuthorityCode}${entityCategoryCode}${adminDivisionCode}${organizationCode}`;
+	checkDigit ||= Mod31.compute(base);
+	return `${base}${checkDigit}`;
+}
 
-	codes: string[];
-	labels: string[];
+export function next(s: string, delta: number = 1) {
+	const sp = s.split('').map((v) => Mod31.numbers[v]);
+	for (let i = sp.length - 1; i >= 0; i--) {
+		if ((delta > 0 && sp[i] < 30) || (delta < 0 && sp[i] > 0)) {
+			sp[i] += delta;
+			break;
+		} else if (delta > 0 && sp[i] === 30) {
+			sp[i] = 0;
+		} else if (delta < 0 && sp[i] === 0) {
+			sp[i] = 30;
+		}
+	}
+	return sp.map((v) => Mod31.chars[v]).join('');
 }

package/src/cn/__snapshots__/ChineseResidentIdNo.test.ts.snap

@@ -0,0 +1,14 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`ChineseResidentIdNo > should parse 1`] = `
+{
+  "addressCode": "110105",
+  "age": 76,
+  "birthDate": "1949-12-31",
+  "checkDigit": 10,
+  "raw": "11010519491231002X",
+  "sequence": 2,
+  "sex": "Male",
+  "valid": true,
+}
+`;

package/src/cn/__snapshots__/UnifiedSocialCreditCode.test.ts.snap

@@ -2,40 +2,46 @@
 
 exports[`UnifiedSocialCreditCode > should parse 1`] = `
 {
-  "bureau": "9",
-  "checksum": "P",
+  "adminDivisionCode": "330106",
+  "checkDigit": "P",
   "codes": [
     "9",
     "1",
     "330106",
     "673959654",
+    "P",
   ],
-  "division": "330106",
-  "labels": [
+  "entityCategoryCode": "1",
+  "names": [
     "工商",
     "企业",
   ],
-  "subject": "673959654",
-  "subjectType": "1",
+  "organizationCode": "673959654",
+  "raw": "91330106673959654P",
+  "registrationAuthorityCode": "9",
+  "valid": true,
 }
 `;
 
 exports[`UnifiedSocialCreditCode > should parse 2`] = `
 {
-  "bureau": "9",
-  "checksum": "R",
+  "adminDivisionCode": "330106",
+  "checkDigit": "R",
   "codes": [
     "9",
     "1",
     "330106",
     "MA2CFLDG4",
+    "R",
   ],
-  "division": "330106",
-  "labels": [
+  "entityCategoryCode": "1",
+  "names": [
     "工商",
     "企业",
   ],
-  "subject": "MA2CFLDG4",
-  "subjectType": "1",
+  "organizationCode": "MA2CFLDG4",
+  "raw": "91330106MA2CFLDG4R",
+  "registrationAuthorityCode": "9",
+  "valid": true,
 }
 `;

package/src/cn/index.ts

@@ -1,3 +1 @@
-export { ResidentIdentityCardNumber } from './ResidentIdentityCardNumber';
-export { DivisionCode } from './DivisionCode';
-export { UnifiedSocialCreditCode } from './UnifiedSocialCreditCode';
+export { ChineseResidentIdNo, UnifiedSocialCreditCode, DivisionCode } from './mod';

package/src/cn/mod.ts

@@ -0,0 +1,3 @@
+export * as ChineseResidentIdNo from './ChineseResidentIdNo.mod';
+export * as UnifiedSocialCreditCode from './UnifiedSocialCreditCode.mod';
+export * as DivisionCode from './DivisionCode.mod';

package/src/consola/formatLogObject.ts

@@ -1,9 +1,9 @@
-import colors from 'chalk';
+import colors, { Chalk, type ChalkInstance } from 'chalk';
 import type { ConsolaOptions, FormatOptions, LogObject, LogType } from 'consola/core';
 import dayjs from 'dayjs';
 import { isDevelopment } from 'std-env';
 
-const levelColors: Record<LogType, (str: string) => string> = {
+const LevelColors: Record<LogType, (str: string) => string> = {
 	trace: colors.gray,
 	debug: colors.cyan,
 	info: colors.blueBright,
@@ -38,16 +38,24 @@ const levelShort: Record<LogType, string> = {
 };
 const start = Date.now();
 
+const Colors: ChalkInstance = colors;
+const NoColors = new Chalk({ level: 0 });
+
 export function formatLogObject(
 	o: LogObject,
 	ctx: {
 		options: ConsolaOptions;
 	},
 ) {
+	const shouldColor = Boolean(ctx.options?.formatOptions?.colors);
+
 	let { date, type, tag } = o;
 	type = type === 'log' ? 'info' : type;
-
-	const color = levelColors[type] || colors.white;
+	const colors = shouldColor ? Colors : NoColors;
+	let color = LevelColors[type] || colors.white;
+	if (!shouldColor) {
+		color = (v) => v;
+	}
 	const levelText = levelShort[type] || type.toUpperCase().slice(0, 4); // Get first 4 chars, consistent uppercase
 
 	let line = '';

package/src/data/maybeNumber.ts

@@ -9,9 +9,13 @@ export function maybeNumber(v: MaybeNumber) {
 		case 'number':
 			return v;
 		case 'bigint':
+			if (v > BigInt(Number.MAX_SAFE_INTEGER) || v < BigInt(Number.MIN_SAFE_INTEGER)) {
+				throw new Error(`bigint out of range`);
+			}
 			return Number(v);
 		case 'string':
-			if (v === '') {
+			v = v.trim();
+			if (!v) {
 				return undefined;
 			}
 	}

package/src/data/resolvePagination.test.ts

@@ -53,6 +53,6 @@ test(resolvePagination.name, () => {
 });
 
 test(`${resolvePagination.name} with options`, () => {
-	expect(resolvePagination({ pageSize: '200' }, { maxPageSize: 50 })).toMatchObject({ pageSize: 50, limit: 50 });
+	expect(resolvePagination({ pageSize: '200' }, { maxLimit: 50 })).toMatchObject({ pageSize: 50, limit: 50 });
 	expect(resolvePagination({}, { pageSize: 30 })).toMatchObject({ pageSize: 30, limit: 30 });
 });

package/src/data/resolvePagination.ts

@@ -1,5 +1,5 @@
 import { maybeFunction, type MaybeFunction } from '@wener/utils';
-import { clamp, mapValues, omitBy, pick } from 'es-toolkit';
+import { mapValues, omitBy, pick } from 'es-toolkit';
 import { maybeNumber, type MaybeNumber } from './maybeNumber';
 
 export type PaginationInput = {
@@ -22,7 +22,8 @@ export function resolvePagination(
 	page: PaginationInput,
 	options: {
 		pageSize?: MaybeFunction<number, [number | undefined]>;
-		maxPageSize?: number;
+		maxLimit?: number;
+		maxOffset?: number;
 	} = {},
 ): ResolvedPagination {
 	let out = omitBy(
@@ -38,15 +39,23 @@ export function resolvePagination(
 	if (options.pageSize) {
 		pageSize = maybeFunction(options.pageSize, pageSize);
 	}
-	pageSize ??= 20;
-	pageSize = clamp(pageSize, 1, options.maxPageSize ?? 1000);
+	pageSize ??= resolvePagination.pageSize;
 
-	let { pageNumber = 1, pageIndex, limit, offset } = out;
+	let { pageNumber = 1, pageIndex } = out;
 	// page index over page number
 	pageNumber = Math.max(pageNumber, 1);
 	pageIndex = Math.max(pageIndex ?? pageNumber - 1, 0);
-	limit = Math.max(1, limit ?? pageSize);
-	offset = Math.max(0, offset ?? pageSize * pageIndex);
+
+	let { limit = pageSize, offset = pageSize * pageIndex } = out;
+	limit = Math.max(1, limit);
+	offset = Math.max(0, offset);
+
+	if (options.maxLimit) {
+		limit = Math.min(limit, options.maxLimit);
+	}
+	if (options.maxOffset) {
+		offset = Math.min(offset, options.maxOffset);
+	}
 
 	pageSize = limit;
 	pageIndex = Math.floor(offset / pageSize);
@@ -58,3 +67,5 @@ export function resolvePagination(
 		pageIndex,
 	};
 }
+
+resolvePagination.pageSize = 20;

package/src/data/types.d.ts

@@ -31,3 +31,15 @@ type ListResult<T = any> = {
 	/** Total number of items */
 	total: number;
 };
+
+type PageInfo = {
+	/** Whether there are more items */
+	hasNextPage: boolean;
+	/** Whether there are previous items */
+	hasPreviousPage: boolean;
+
+	// /** Start cursor */
+	// startCursor?: string;
+	// /** End cursor */
+	// endCursor?: string;
+};

package/src/dayjs/dayjs.ts

@@ -0,0 +1,40 @@
+import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import dayOfYear from 'dayjs/plugin/dayOfYear';
+import duration from 'dayjs/plugin/duration';
+import isBetween from 'dayjs/plugin/isBetween';
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
+import isToday from 'dayjs/plugin/isToday';
+import isTomorrow from 'dayjs/plugin/isTomorrow';
+import isYesterday from 'dayjs/plugin/isYesterday';
+import localeData from 'dayjs/plugin/localeData';
+import objectSupport from 'dayjs/plugin/objectSupport';
+import quarterOfYear from 'dayjs/plugin/quarterOfYear';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
+import toObject from 'dayjs/plugin/toObject';
+import utc from 'dayjs/plugin/utc';
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/zh';
+
+dayjs.extend(advancedFormat);
+dayjs.extend(dayOfYear);
+dayjs.extend(duration);
+dayjs.extend(isBetween);
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
+dayjs.extend(isToday);
+dayjs.extend(isTomorrow);
+dayjs.extend(isYesterday);
+dayjs.extend(localeData);
+dayjs.extend(objectSupport);
+dayjs.extend(quarterOfYear);
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+dayjs.extend(toObject);
+dayjs.extend(utc);
+dayjs.locale('zh-cn');
+dayjs.tz.setDefault('Asia/Shanghai');
+
+export { dayjs };

package/src/dayjs/formatDuration.test.ts

@@ -0,0 +1,14 @@
+import { expect, test } from 'vitest';
+import { formatDuration } from './formatDuration';
+
+test('formatDuration', () => {
+	for (const [a, b] of [
+		[0, '0ms'],
+		[1000, '1s'],
+		[1000 * 60, '1m'],
+		[1000 * 60 + 1000, '1m1s'],
+		[1000 * 60 + 1000 + 1, '1m1s1ms'],
+	]) {
+		expect(formatDuration(a)).toBe(b);
+	}
+});

package/src/dayjs/formatDuration.ts

@@ -0,0 +1,86 @@
+import { type OpUnitType, type UnitTypeLongPlural } from 'dayjs';
+import { type Duration } from 'dayjs/plugin/duration';
+import { parseDuration } from './parseDuration';
+
+type FormatDurationOptions = {
+	humanize?: boolean;
+	format?: string | 'human' | 'humanize' | 'iso' | 'auto';
+	iso?: boolean;
+};
+
+export type MaybeDuration =
+	| number
+	| string
+	| Duration
+	| Partial<{
+			[unit in Exclude<UnitTypeLongPlural, 'dates'> | 'weeks']: number;
+	  }>
+	| {
+			value: number;
+			unit?: Exclude<OpUnitType, 'date' | 'dates'>;
+	  }
+	| undefined
+	| null;
+
+export function formatDuration(value: MaybeDuration, o?: FormatDurationOptions): string | undefined {
+	const v = parseDuration(value);
+	if (v === undefined || v === null) {
+		return;
+	}
+
+	let { format, humanize, iso } = o || {};
+	// Use local variables instead of modifying o directly
+	switch (format) {
+		case 'human':
+		case 'humanize':
+			humanize = true;
+			format = undefined;
+			break;
+		case 'iso':
+			iso = true;
+			format = undefined;
+			break;
+		case 'auto':
+			format = undefined;
+			break;
+	}
+
+	if (humanize) {
+		return v.humanize();
+	}
+	if (iso) {
+		return v.toISOString();
+	}
+	if (format) {
+		return v.format(format);
+	}
+
+	// auto format
+	// 1h2m3s
+	if (v.asDays() > 1) {
+		let s = v.toISOString();
+		return s.replace('P', '').replace('T', '').toLowerCase();
+	}
+
+	{
+		let parts: string[] = [];
+		let h = v.hours();
+		let m = v.minutes();
+		let s = v.seconds();
+		let ms = v.milliseconds();
+
+		if (h > 0) {
+			parts.push(`${h}h`);
+		}
+		if (m > 0) {
+			parts.push(`${m}m`);
+		}
+		if (s > 0) {
+			parts.push(`${s}s`);
+		}
+		if (ms > 0 || (h === 0 && m === 0 && s === 0)) {
+			parts.push(`${ms}ms`);
+		}
+		return parts.join('');
+	}
+}

package/src/dayjs/index.ts

@@ -0,0 +1,3 @@
+export { dayjs } from './dayjs';
+export { parseDuration } from './parseDuration';
+export { formatDuration } from './formatDuration';

package/src/dayjs/parseDuration.ts

@@ -0,0 +1,40 @@
+import type { OpUnitType, UnitTypeLongPlural } from 'dayjs';
+import type { Duration } from 'dayjs/plugin/duration';
+import { dayjs } from './dayjs';
+
+export type MaybeDuration =
+	| number
+	| string
+	| Duration
+	| Partial<{
+			[unit in Exclude<UnitTypeLongPlural, 'dates'> | 'weeks']: number;
+	  }>
+	| {
+			value: number;
+			unit?: Exclude<OpUnitType, 'date' | 'dates'>;
+	  }
+	| undefined
+	| null;
+
+export function parseDuration(value: MaybeDuration): Duration | undefined {
+	if (!value && value !== 0) {
+		return;
+	}
+	let duration: Duration;
+	if (typeof value === 'number') {
+		duration = dayjs.duration(value);
+	} else if (typeof value === 'string' && value.startsWith('P')) {
+		// PT0S
+		duration = dayjs.duration(value);
+	} else if (typeof value === 'object' && 'value' in value) {
+		duration = dayjs.duration(value.value, value.unit);
+	} else if (dayjs.isDuration(value)) {
+		duration = value;
+	} else if (typeof value === 'object') {
+		duration = dayjs.duration(value);
+	} else {
+		console.warn(`Invalid duration value:`, value);
+		return;
+	}
+	return duration;
+}

package/src/decimal/index.ts

@@ -0,0 +1 @@
+export { parseDecimal } from './parseDecimal';

package/src/decimal/parseDecimal.ts

@@ -0,0 +1,16 @@
+import Decimal from 'decimal.js';
+
+export function parseDecimal(v: string | number | Decimal): Decimal;
+export function parseDecimal(v: string | number | Decimal | undefined | null): Decimal | undefined;
+export function parseDecimal(v: string | number | Decimal | undefined | null): Decimal | undefined {
+	switch (v) {
+		case '':
+		case undefined:
+		case null:
+			return undefined;
+	}
+	if (Decimal.isDecimal(v)) {
+		return v;
+	}
+	return new Decimal(v);
+}