@wener/common 2.0.5 → 2.0.6

package/lib/resource/schema/ResourceStatus.js

@@ -1,95 +1,97 @@
-import { z } from "zod/v4";
+import { z } from 'zod/v4';
 export const ResourceStatus = Object.freeze({
-    __proto__: null,
-    Active: 'Active',
-    Approved: 'Approved',
-    Cancelled: 'Cancelled',
-    Closed: 'Closed',
-    Completed: 'Completed',
-    Confirmed: 'Confirmed',
-    Contacted: 'Contacted',
-    Contacting: 'Contacting',
-    Deleted: 'Deleted',
-    Denied: 'Denied',
-    Disabled: 'Disabled',
-    Disqualified: 'Disqualified',
-    Draft: 'Draft',
-    Enabled: 'Enabled',
-    Expired: 'Expired',
-    Failed: 'Failed',
-    InProgress: 'InProgress',
-    Inactive: 'Inactive',
-    Initial: 'Initial',
-    Lost: 'Lost',
-    New: 'New',
-    Nurturing: 'Nurturing',
-    OnHold: 'OnHold',
-    Open: 'Open',
-    Overdue: 'Overdue',
-    Paid: 'Paid',
-    PartiallyPaid: 'PartiallyPaid',
-    Pending: 'Pending',
-    PendingAcceptance: 'PendingAcceptance',
-    PendingApproval: 'PendingApproval',
-    PendingConfirmation: 'PendingConfirmation',
-    PendingResubmission: 'PendingResubmission',
-    Posted: 'Posted',
-    Published: 'Published',
-    Qualified: 'Qualified',
-    Rejected: 'Rejected',
-    Submitted: 'Submitted',
-    Suspended: 'Suspended',
-    Terminated: 'Terminated',
-    Unqualified: 'Unqualified',
-    Void: 'Void',
-    Won: 'Won'
-});
-export const ResourceStatusSchema = z.union([
-    z.literal(ResourceStatus.Active).describe('活跃'),
-    z.literal(ResourceStatus.Approved).describe('已通过'),
-    z.literal(ResourceStatus.Cancelled).describe('已取消'),
-    z.literal(ResourceStatus.Closed).describe('已关闭'),
-    z.literal(ResourceStatus.Completed).describe('已完成'),
-    z.literal(ResourceStatus.Confirmed).describe('已确认'),
-    z.literal(ResourceStatus.Contacted).describe('已联系'),
-    z.literal(ResourceStatus.Contacting).describe('联系中'),
-    z.literal(ResourceStatus.Deleted).describe('已删除'),
-    z.literal(ResourceStatus.Denied).describe('已拒绝'),
-    z.literal(ResourceStatus.Disabled).describe('已禁用'),
-    z.literal(ResourceStatus.Disqualified).describe('不合格'),
-    z.literal(ResourceStatus.Draft).describe('草稿'),
-    z.literal(ResourceStatus.Enabled).describe('已启用'),
-    z.literal(ResourceStatus.Expired).describe('已过期'),
-    z.literal(ResourceStatus.InProgress).describe('进行中'),
-    z.literal(ResourceStatus.Inactive).describe('停用'),
-    z.literal(ResourceStatus.Initial).describe('初始'),
-    z.literal(ResourceStatus.Lost).describe('已失去'),
-    z.literal(ResourceStatus.New).describe('新建'),
-    z.literal(ResourceStatus.Nurturing).describe('培育中'),
-    z.literal(ResourceStatus.OnHold).describe('搁置'),
-    z.literal(ResourceStatus.Open).describe('开放'),
-    z.literal(ResourceStatus.Overdue).describe('逾期'),
-    z.literal(ResourceStatus.Paid).describe('已支付'),
-    z.literal(ResourceStatus.PartiallyPaid).describe('部分支付'),
-    z.literal(ResourceStatus.Pending).describe('待审核'),
-    z.literal(ResourceStatus.PendingAcceptance).describe('待接受'),
-    z.literal(ResourceStatus.PendingApproval).describe('待批准'),
-    z.literal(ResourceStatus.PendingConfirmation).describe('待确认'),
-    z.literal(ResourceStatus.PendingResubmission).describe('待重新提交'),
-    z.literal(ResourceStatus.Posted).describe('已过账'),
-    z.literal(ResourceStatus.Published).describe('已发布'),
-    z.literal(ResourceStatus.Qualified).describe('已合格'),
-    z.literal(ResourceStatus.Rejected).describe('已驳回'),
-    z.literal(ResourceStatus.Submitted).describe('已提交'),
-    z.literal(ResourceStatus.Suspended).describe('暂停'),
-    z.literal(ResourceStatus.Terminated).describe('终止'),
-    z.literal(ResourceStatus.Unqualified).describe('未达标'),
-    z.literal(ResourceStatus.Void).describe('作废'),
-    z.literal(ResourceStatus.Won).describe('已赢得')
-]).meta({
-    title: 'ResourceStatus',
-    description: '资源状态',
-    type: 'string'
+	__proto__: null,
+	Active: 'Active',
+	Approved: 'Approved',
+	Cancelled: 'Cancelled',
+	Closed: 'Closed',
+	Completed: 'Completed',
+	Confirmed: 'Confirmed',
+	Contacted: 'Contacted',
+	Contacting: 'Contacting',
+	Deleted: 'Deleted',
+	Denied: 'Denied',
+	Disabled: 'Disabled',
+	Disqualified: 'Disqualified',
+	Draft: 'Draft',
+	Enabled: 'Enabled',
+	Expired: 'Expired',
+	Failed: 'Failed',
+	InProgress: 'InProgress',
+	Inactive: 'Inactive',
+	Initial: 'Initial',
+	Lost: 'Lost',
+	New: 'New',
+	Nurturing: 'Nurturing',
+	OnHold: 'OnHold',
+	Open: 'Open',
+	Overdue: 'Overdue',
+	Paid: 'Paid',
+	PartiallyPaid: 'PartiallyPaid',
+	Pending: 'Pending',
+	PendingAcceptance: 'PendingAcceptance',
+	PendingApproval: 'PendingApproval',
+	PendingConfirmation: 'PendingConfirmation',
+	PendingResubmission: 'PendingResubmission',
+	Posted: 'Posted',
+	Published: 'Published',
+	Qualified: 'Qualified',
+	Rejected: 'Rejected',
+	Submitted: 'Submitted',
+	Suspended: 'Suspended',
+	Terminated: 'Terminated',
+	Unqualified: 'Unqualified',
+	Void: 'Void',
+	Won: 'Won',
 });
+export const ResourceStatusSchema = z
+	.union([
+		z.literal(ResourceStatus.Active).describe('活跃'),
+		z.literal(ResourceStatus.Approved).describe('已通过'),
+		z.literal(ResourceStatus.Cancelled).describe('已取消'),
+		z.literal(ResourceStatus.Closed).describe('已关闭'),
+		z.literal(ResourceStatus.Completed).describe('已完成'),
+		z.literal(ResourceStatus.Confirmed).describe('已确认'),
+		z.literal(ResourceStatus.Contacted).describe('已联系'),
+		z.literal(ResourceStatus.Contacting).describe('联系中'),
+		z.literal(ResourceStatus.Deleted).describe('已删除'),
+		z.literal(ResourceStatus.Denied).describe('已拒绝'),
+		z.literal(ResourceStatus.Disabled).describe('已禁用'),
+		z.literal(ResourceStatus.Disqualified).describe('不合格'),
+		z.literal(ResourceStatus.Draft).describe('草稿'),
+		z.literal(ResourceStatus.Enabled).describe('已启用'),
+		z.literal(ResourceStatus.Expired).describe('已过期'),
+		z.literal(ResourceStatus.InProgress).describe('进行中'),
+		z.literal(ResourceStatus.Inactive).describe('停用'),
+		z.literal(ResourceStatus.Initial).describe('初始'),
+		z.literal(ResourceStatus.Lost).describe('已失去'),
+		z.literal(ResourceStatus.New).describe('新建'),
+		z.literal(ResourceStatus.Nurturing).describe('培育中'),
+		z.literal(ResourceStatus.OnHold).describe('搁置'),
+		z.literal(ResourceStatus.Open).describe('开放'),
+		z.literal(ResourceStatus.Overdue).describe('逾期'),
+		z.literal(ResourceStatus.Paid).describe('已支付'),
+		z.literal(ResourceStatus.PartiallyPaid).describe('部分支付'),
+		z.literal(ResourceStatus.Pending).describe('待审核'),
+		z.literal(ResourceStatus.PendingAcceptance).describe('待接受'),
+		z.literal(ResourceStatus.PendingApproval).describe('待批准'),
+		z.literal(ResourceStatus.PendingConfirmation).describe('待确认'),
+		z.literal(ResourceStatus.PendingResubmission).describe('待重新提交'),
+		z.literal(ResourceStatus.Posted).describe('已过账'),
+		z.literal(ResourceStatus.Published).describe('已发布'),
+		z.literal(ResourceStatus.Qualified).describe('已合格'),
+		z.literal(ResourceStatus.Rejected).describe('已驳回'),
+		z.literal(ResourceStatus.Submitted).describe('已提交'),
+		z.literal(ResourceStatus.Suspended).describe('暂停'),
+		z.literal(ResourceStatus.Terminated).describe('终止'),
+		z.literal(ResourceStatus.Unqualified).describe('未达标'),
+		z.literal(ResourceStatus.Void).describe('作废'),
+		z.literal(ResourceStatus.Won).describe('已赢得'),
+	])
+	.meta({
+		title: 'ResourceStatus',
+		description: '资源状态',
+		type: 'string',
+	});
 
-//# sourceMappingURL=ResourceStatus.js.map
+//# sourceMappingURL=ResourceStatus.js.map

package/lib/resource/schema/ResourceType.js

@@ -1,26 +1,28 @@
-import { z } from "zod/v4";
+import { z } from 'zod/v4';
 export const ResourceType = Object.freeze({
-    __proto__: null,
-    User: 'User',
-    Customer: 'Customer',
-    Contact: 'Contact',
-    Account: 'Account',
-    Order: 'Order',
-    Lead: 'Lead',
-    Opportunity: 'Opportunity'
-});
-export const ResourceTypeSchema = z.union([
-    z.literal(ResourceType.User).describe('用户'),
-    z.literal(ResourceType.Customer).describe('客户'),
-    z.literal(ResourceType.Contact).describe('联系人'),
-    z.literal(ResourceType.Account).describe('账户'),
-    z.literal(ResourceType.Order).describe('订单'),
-    z.literal(ResourceType.Lead).describe('线索'),
-    z.literal(ResourceType.Opportunity).describe('商机')
-]).meta({
-    title: 'ResourceType',
-    description: '资源类型',
-    type: 'string'
+	__proto__: null,
+	User: 'User',
+	Customer: 'Customer',
+	Contact: 'Contact',
+	Account: 'Account',
+	Order: 'Order',
+	Lead: 'Lead',
+	Opportunity: 'Opportunity',
 });
+export const ResourceTypeSchema = z
+	.union([
+		z.literal(ResourceType.User).describe('用户'),
+		z.literal(ResourceType.Customer).describe('客户'),
+		z.literal(ResourceType.Contact).describe('联系人'),
+		z.literal(ResourceType.Account).describe('账户'),
+		z.literal(ResourceType.Order).describe('订单'),
+		z.literal(ResourceType.Lead).describe('线索'),
+		z.literal(ResourceType.Opportunity).describe('商机'),
+	])
+	.meta({
+		title: 'ResourceType',
+		description: '资源类型',
+		type: 'string',
+	});
 
-//# sourceMappingURL=ResourceType.js.map
+//# sourceMappingURL=ResourceType.js.map

package/lib/resource/schema/index.js

@@ -1,6 +1,6 @@
-export { ResourceStatus, ResourceStatusSchema } from "./ResourceStatus.js";
-export { ResourceActionType, ResourceActionTypeSchema, ResourceActionDataSchema } from "./ResourceActionType.js";
-export { AnyResourceSchema } from "./AnyResourceSchema.js";
-export { rz } from "./types.js";
-export { BaseResourceSchema } from "./BaseResourceSchema.js";
+export { AnyResourceSchema } from './AnyResourceSchema.js';
+export { BaseResourceSchema } from './BaseResourceSchema.js';
+export { ResourceActionDataSchema, ResourceActionType, ResourceActionTypeSchema } from './ResourceActionType.js';
+export { ResourceStatus, ResourceStatusSchema } from './ResourceStatus.js';
+export { rz } from './types.js';
 //# sourceMappingURL=index.js.map

package/lib/resource/schema/types.js

@@ -1,9 +1,13 @@
-import { isValid } from "date-fns";
-import dayjs from "dayjs";
-import { z } from "zod/v4";
-const TypeIdSchema = z.string().regex(/^[a-zA-Z0-9]+_[a-zA-Z0-9]+$/, {
-    error: 'ID格式错误'
-}).describe('ID');
+import { isValid } from 'date-fns';
+import dayjs from 'dayjs';
+import { z } from 'zod/v4';
+
+const TypeIdSchema = z
+	.string()
+	.regex(/^[a-zA-Z0-9]+_[a-zA-Z0-9]+$/, {
+		error: 'ID格式错误',
+	})
+	.describe('ID');
 /*
 XXX-XXX-XXXX
 National: (XXX) XXX-XXXX
@@ -25,61 +29,88 @@ XXXXXXXXXXX
 
 https://uibakery.io/regex-library/phone-number
 https://fakerjs.dev/api/phone
- */ const PhoneNumberSchema = z.string().trim().max(20).regex(/(^$)|(^[0-9]*$)/, {
-    error: '电话号码只能包含数字'
-}).meta({
-    format: 'phone'
-});
+ */ const PhoneNumberSchema = z
+	.string()
+	.trim()
+	.max(20)
+	.regex(/(^$)|(^[0-9]*$)/, {
+		error: '电话号码只能包含数字',
+	})
+	.meta({
+		format: 'phone',
+	});
 function resourceIdOf(entity) {
-    return rz.resourceId.meta({
-        'x-ref-entity': entity
-    });
+	return rz.resourceId.meta({
+		'x-ref-entity': entity,
+	});
 }
 // allow empty string
-const JsonDateSchema = z.coerce.string().trim().overwrite((v)=>{
-    if (v && !/^\d{4}-\d{2}-\d{2}$/.test(v)) {
-        let val = dayjs(v);
-        if (val.isValid()) {
-            return val.format('YYYY-MM-DD');
-        }
-    }
-    return v;
-}).regex(/(^$)|(^\d{4}-\d{2}-\d{2}$)/, {
-    error: '错误的日期格式'
-}).refine((value)=>!value || isValid(new Date(value)), {
-    error: '错误的日期'
-}).nullish().overwrite((v)=>v || undefined).meta({
-    format: 'date'
-});
+const JsonDateSchema = z.coerce
+	.string()
+	.trim()
+	.overwrite((v) => {
+		if (v && !/^\d{4}-\d{2}-\d{2}$/.test(v)) {
+			let val = dayjs(v);
+			if (val.isValid()) {
+				return val.format('YYYY-MM-DD');
+			}
+		}
+		return v;
+	})
+	.regex(/(^$)|(^\d{4}-\d{2}-\d{2}$)/, {
+		error: '错误的日期格式',
+	})
+	.refine((value) => !value || isValid(new Date(value)), {
+		error: '错误的日期',
+	})
+	.nullish()
+	.overwrite((v) => v || undefined)
+	.meta({
+		format: 'date',
+	});
 const JsonDateTimeSchema = z.coerce.date().meta({
-    format: 'date-time',
-    type: 'string'
-});
-const LoginNameSchema = z.string().trim().regex(/^[a-z0-9]{3,16}$/, {
-    error: '登录名只能包含小写字母和数字，长度为3-16位'
+	format: 'date-time',
+	type: 'string',
 });
+const LoginNameSchema = z
+	.string()
+	.trim()
+	.regex(/^[a-z0-9]{3,16}$/, {
+		error: '登录名只能包含小写字母和数字，长度为3-16位',
+	});
 // maybe check valid cjk
-const FriendlyNameSchema = z.string().trim().max(50).refine((v)=>!/\p{C}/u.test(v), {
-    message: '包含无效字符'
-}).describe('名称');
-const PasswordSchema = z.string().min(6, {
-    error: '密码长度至少 6 位'
-}).max(36, {
-    error: '密码长度最多 36 位'
-}).regex(/^\S*$/, {
-    error: '密码不能包含空格'
-}).describe('密码').meta({
-    sensitive: true
-});
+const FriendlyNameSchema = z
+	.string()
+	.trim()
+	.max(50)
+	.refine((v) => !/\p{C}/u.test(v), {
+		message: '包含无效字符',
+	})
+	.describe('名称');
+const PasswordSchema = z
+	.string()
+	.min(6, {
+		error: '密码长度至少 6 位',
+	})
+	.max(36, {
+		error: '密码长度最多 36 位',
+	})
+	.regex(/^\S*$/, {
+		error: '密码不能包含空格',
+	})
+	.describe('密码')
+	.meta({
+		sensitive: true,
+	});
 export const rz = {
-    resourceIdOf: resourceIdOf,
-    date: JsonDateSchema,
-    dateTime: JsonDateTimeSchema,
-    resourceId: TypeIdSchema,
-    phoneNumber: PhoneNumberSchema,
-    loginName: LoginNameSchema,
-    password: PasswordSchema,
-    friendlyName: FriendlyNameSchema
+	resourceIdOf: resourceIdOf,
+	date: JsonDateSchema,
+	dateTime: JsonDateTimeSchema,
+	resourceId: TypeIdSchema,
+	phoneNumber: PhoneNumberSchema,
+	loginName: LoginNameSchema,
+	password: PasswordSchema,
+	friendlyName: FriendlyNameSchema,
 };
 
-//# sourceMappingURL=types.js.map
+//# sourceMappingURL=types.js.map

package/lib/resource/schema/types.test.js

@@ -1,14 +1,17 @@
-import { describe, it } from "vitest";
-import { createSchemaData, toJsonSchema } from "../../schema/index.js";
-import { renderJsonSchemaToMarkdownDoc } from "../../tools/renderJsonSchemaToMarkdownDoc.js";
-import { AnyResourceSchema } from "./AnyResourceSchema.js";
-describe("schema", function () {
-    it("should be convert to jsonschema", function () {
-        console.log(renderJsonSchemaToMarkdownDoc(toJsonSchema(AnyResourceSchema)));
-    });
-    it("should create from schema", function () {
-        console.log(createSchemaData(AnyResourceSchema, {
-            all: true
-        }));
-    });
+import { describe, it } from 'vitest';
+import { createSchemaData, toJsonSchema } from '../../schema/index.js';
+import { renderJsonSchemaToMarkdownDoc } from '../../tools/renderJsonSchemaToMarkdownDoc.js';
+import { AnyResourceSchema } from './AnyResourceSchema.js';
+
+describe('schema', () => {
+	it('should be convert to jsonschema', () => {
+		console.log(renderJsonSchemaToMarkdownDoc(toJsonSchema(AnyResourceSchema)));
+	});
+	it('should create from schema', () => {
+		console.log(
+			createSchemaData(AnyResourceSchema, {
+				all: true,
+			}),
+		);
+	});
 });

package/lib/s3/formatS3Url.js

@@ -1,65 +1,65 @@
 function isValidBucketName(bucket) {
-    const bucketRegex = /^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$/;
-    return bucketRegex.test(bucket) && !bucket.includes('..') && !bucket.includes('.-') && !bucket.includes('-.');
+	const bucketRegex = /^[a-z0-9][a-z0-9.-]{1,61}[a-z0-9]$/;
+	return bucketRegex.test(bucket) && !bucket.includes('..') && !bucket.includes('.-') && !bucket.includes('-.');
 }
 export function formatS3Url(o, { credentials, useParams } = {}) {
-    if (!o || typeof o !== 'object') {
-        throw new Error('S3 options must be an object');
-    }
-    if (!o.endpoint) {
-        throw new Error('Endpoint is required');
-    }
-    let url;
-    let ep = o.endpoint || 's3.amazonaws.com';
-    try {
-        if (URL.canParse(ep)) {
-            url = new URL(ep);
-        } else {
-            url = new URL(`https://${ep}`);
-        }
-    } catch (_error) {
-        throw new Error(`Invalid endpoint: ${ep}`);
-    }
-    const { useSsl = true, region, pathStyle, port, accessKeyId, secretAccessKey, bucket } = o;
-    url.protocol = useSsl ? 'https:' : 'http:';
-    if (credentials) {
-        if (accessKeyId && secretAccessKey) {
-            url.username = encodeURIComponent(accessKeyId);
-            url.password = encodeURIComponent(secretAccessKey);
-        } else {
-            throw new Error('Access Key ID and Secret Access Key are required for credentials');
-        }
-    }
-    if (useParams) {
-        if (region) {
-            url.searchParams.set('region', region);
-        }
-        if (pathStyle !== undefined) {
-            url.searchParams.set('pathStyle', String(pathStyle));
-        }
-    }
-    if (port) {
-        const portNum = Number(port);
-        if (Number.isNaN(portNum) || portNum < 1 || portNum > 65535) {
-            throw new Error('Port must be a valid number between 1 and 65535');
-        }
-        url.port = String(portNum);
-    }
-    if (bucket) {
-        if (!isValidBucketName(bucket)) {
-            throw new Error(`Invalid bucket name: ${bucket}`);
-        }
-        if (pathStyle) {
-            url.pathname = `/${bucket}${url.pathname}`;
-        } else {
-            // Check if bucket is already in hostname (virtual-hosted style)
-            const bucketPattern = new RegExp(`^${bucket.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\.`);
-            if (!bucketPattern.test(url.hostname)) {
-                url.hostname = `${bucket}.${url.hostname}`;
-            }
-        }
-    }
-    return url.toString();
+	if (!o || typeof o !== 'object') {
+		throw new Error('S3 options must be an object');
+	}
+	if (!o.endpoint) {
+		throw new Error('Endpoint is required');
+	}
+	let url;
+	let ep = o.endpoint || 's3.amazonaws.com';
+	try {
+		if (URL.canParse(ep)) {
+			url = new URL(ep);
+		} else {
+			url = new URL(`https://${ep}`);
+		}
+	} catch (_error) {
+		throw new Error(`Invalid endpoint: ${ep}`);
+	}
+	const { useSsl = true, region, pathStyle, port, accessKeyId, secretAccessKey, bucket } = o;
+	url.protocol = useSsl ? 'https:' : 'http:';
+	if (credentials) {
+		if (accessKeyId && secretAccessKey) {
+			url.username = encodeURIComponent(accessKeyId);
+			url.password = encodeURIComponent(secretAccessKey);
+		} else {
+			throw new Error('Access Key ID and Secret Access Key are required for credentials');
+		}
+	}
+	if (useParams) {
+		if (region) {
+			url.searchParams.set('region', region);
+		}
+		if (pathStyle !== undefined) {
+			url.searchParams.set('pathStyle', String(pathStyle));
+		}
+	}
+	if (port) {
+		const portNum = Number(port);
+		if (Number.isNaN(portNum) || portNum < 1 || portNum > 65535) {
+			throw new Error('Port must be a valid number between 1 and 65535');
+		}
+		url.port = String(portNum);
+	}
+	if (bucket) {
+		if (!isValidBucketName(bucket)) {
+			throw new Error(`Invalid bucket name: ${bucket}`);
+		}
+		if (pathStyle) {
+			url.pathname = `/${bucket}${url.pathname}`;
+		} else {
+			// Check if bucket is already in hostname (virtual-hosted style)
+			const bucketPattern = new RegExp(`^${bucket.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\.`);
+			if (!bucketPattern.test(url.hostname)) {
+				url.hostname = `${bucket}.${url.hostname}`;
+			}
+		}
+	}
+	return url.toString();
 }
 
-//# sourceMappingURL=formatS3Url.js.map
+//# sourceMappingURL=formatS3Url.js.map