@wener/common 2.0.1 → 2.0.2

package/lib/resource/ListQuery.js

@@ -0,0 +1,119 @@
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
+}
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _iterable_to_array(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _non_iterable_spread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
+}
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
+}
+import { z } from 'zod/v4';
+var IntLikeSchema = z.coerce.number().multipleOf(1).min(0).optional().overwrite(function(v) {
+    return v || undefined;
+});
+export var ListQuerySchema = z.object({
+    id: z.coerce.string().optional(),
+    ids: z.array(z.coerce.string()).optional(),
+    filter: z.string().optional().describe('sql-like filter string'),
+    filters: z.array(z.any()).optional().describe('sql-like filter string'),
+    where: z.record(z.string(), z.any()).optional().describe('document query filter'),
+    search: z.string().optional(),
+    limit: IntLikeSchema,
+    offset: IntLikeSchema,
+    order: z.array(z.string()).optional().describe('order like "a,-b,c desc null last"'),
+    pageIndex: IntLikeSchema.describe('0-based page index'),
+    pageNumber: IntLikeSchema.describe('1-based page number'),
+    pageSize: IntLikeSchema,
+    cursor: z.string().optional(),
+    deleted: z.coerce.boolean().optional()
+});
+export function resolveListQuery(target) {
+    for(var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+        args[_key - 1] = arguments[_key];
+    }
+    var out = args.reduce(function(a, source) {
+        if (typeof source === 'function') {
+            var result = source(a);
+            // do not use the result as merge source
+            return result || a;
+        }
+        var b = source;
+        if (!b) return a;
+        // do not resolve id to ids
+        var ids = _to_consumable_array(a.ids || []).concat(_to_consumable_array(b.ids || []));
+        return _object_spread_props(_object_spread({}, a, b), {
+            ids: ids,
+            filters: _to_consumable_array(a.filters || []).concat(_to_consumable_array(b.filters || [])),
+            search: b.search || a.search
+        });
+    }, target || {});
+    return ListQuerySchema.parse(out);
+}

package/lib/resource/index.js

@@ -1 +1,2 @@
 export { getTitleOfResource } from "./getTitleOfResource.js";
+export { resolveListQuery, ListQuerySchema } from "./ListQuery.js";

package/lib/resource/schema/AnyResourceSchema.js

@@ -1,5 +1,5 @@
 import { z } from "zod/v4";
-import { SexTypeSchema } from "./SexType.js";
+import { SexTypeSchema } from "../../foundation/schema/SexType.js";
 import { rz } from "./types.js";
 export var AnyResourceSchema = z.object({
     id: rz.resourceId.readonly().describe("ID"),

package/lib/resource/schema/index.js

@@ -0,0 +1,5 @@
+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";

package/lib/{resource/schema → schema}/SchemaRegistry.js

@@ -1,5 +1,9 @@
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 import { getGlobalStates } from "@wener/utils";
-import { toJsonSchema } from "../../schema/index.js";
+import { toJsonSchema } from "./index.js";
 var types = getGlobalStates("@wener/common/resource/schema/SchemaRegistry", function () {
     return new Map();
 });
@@ -10,7 +14,7 @@ export function get(needle) {
         return found;
     }
     else {
-        if (typeof needle !== "string") {
+        if (needle && typeof needle !== "string") {
             return toJsonSchema(needle);
         }
     }
@@ -30,9 +34,12 @@ function getKey(s) {
     }
     return key;
 }
-export function add(def) {
-    types.set(getKey(def), toJsonSchema(def));
-}
 export function set(key, def) {
+    if (!def) {
+        def = key;
+        if (!def || (typeof def === "undefined" ? "undefined" : _type_of(def)) !== "object") {
+            throw new Error("Invalid schema definition for: ".concat(getKey(key)));
+        }
+    }
     types.set(getKey(key), toJsonSchema(def));
 }

package/lib/schema/SchemaRegistry.mod.js

@@ -0,0 +1,2 @@
+import * as _SchemaRegistry from "./SchemaRegistry.js";
+export { _SchemaRegistry as SchemaRegistry };

package/lib/schema/createSchemaData.js

@@ -124,7 +124,7 @@ function _create(schema, options, ctx) {
         type: "object"
     }, function () {
         var out = {};
-        var required = schema.required || [];
+        var required = Array.isArray(schema.required) ? schema.required : [];
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
             for (var _iterator = Object.entries(schema.properties || {})[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {

package/lib/schema/getSchemaOptions.js

@@ -1,8 +1,8 @@
 import { deepFreeze } from "@wener/utils";
 import { getSchemaCache } from "./getSchemaCache.js";
-import { toJsonSchema } from "./toJsonSchema.js";
+import { SchemaRegistry } from "./SchemaRegistry.mod.js";
 export function getSchemaOptions(s) {
-    var js = toJsonSchema(s);
+    var js = SchemaRegistry.get(s);
     return getSchemaCache(s, "options", function () {
         var _this;
         var out = ((_this = js.anyOf || js.oneOf) === null || _this === void 0 ? void 0 : _this.map(function (v) {

package/lib/schema/index.js

@@ -3,3 +3,4 @@ export { getSchemaOptions, getSchemaOptionLabel } from "./getSchemaOptions.js";
 export { toJsonSchema } from "./toJsonSchema.js";
 export { findJsonSchemaByPath } from "./findJsonSchemaByPath.js";
 export { createSchemaData } from "./createSchemaData.js";
+export { SchemaRegistry } from "./SchemaRegistry.mod.js";

package/lib/utils/getEstimateProcessTime.js

@@ -0,0 +1,20 @@
+export function getEstimateProcessTime(param) {
+    var total = param.total, processed = param.processed, startTime = param.startTime, _param_elapsed = param.elapsed, elapsed = _param_elapsed === void 0 ? startTime ? (Date.now() - startTime.getTime()) / 1000 : undefined : _param_elapsed;
+    if (typeof total !== 'number' || typeof processed !== 'number' || !elapsed || processed === 0 || processed >= total) {
+        return undefined;
+    }
+    var now = new Date();
+    var rate = processed / elapsed;
+    if (rate === 0) {
+        return undefined;
+    }
+    var remaining = total - processed;
+    var eta = Math.round(remaining / rate);
+    var endTime = new Date(now.getTime() + eta * 1000);
+    return {
+        eta: eta,
+        elapsed: elapsed,
+        endTime: endTime,
+        rate: rate
+    };
+}

package/lib/utils/index.js

@@ -0,0 +1 @@
+export { getEstimateProcessTime } from "./getEstimateProcessTime.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wener/common",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "type": "module",
   "description": "",
   "author": "",
@@ -22,6 +22,14 @@
       "types": "./src/data/index.ts",
       "default": "./lib/data/index.js"
     },
+    "./dayjs": {
+      "types": "./src/dayjs/index.ts",
+      "default": "./lib/dayjs/index.js"
+    },
+    "./decimal": {
+      "types": "./src/decimal/index.ts",
+      "default": "./lib/decimal/index.js"
+    },
     "./jsonschema": {
       "types": "./src/jsonschema/index.ts",
       "default": "./lib/jsonschema/index.js"
@@ -38,14 +46,14 @@
       "types": "./src/resource/index.ts",
       "default": "./lib/resource/index.js"
     },
+    "./resource/schema": {
+      "types": "./src/resource/schema/index.ts",
+      "default": "./lib/resource/schema/index.js"
+    },
     "./schema": {
       "types": "./src/schema/index.ts",
       "default": "./lib/schema/index.js"
     },
-    "./search": {
-      "types": "./src/search/index.ts",
-      "default": "./lib/search/index.js"
-    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -62,27 +70,28 @@
     "@standard-schema/spec": "^1.0.0",
     "@wener/utils": "^1.1.51",
     "date-fns": "^4.1.0",
-    "es-toolkit": "^1.37.2",
+    "es-toolkit": "^1.39.10",
     "std-env": "^3.9.0",
-    "ts-pattern": "^5.7.0"
+    "ts-pattern": "^5.8.0"
   },
   "devDependencies": {
-    "@sinclair/typebox": "^0.34.33",
+    "@sinclair/typebox": "^0.34.41",
     "@sinclair/typebox-codegen": "^0.11.1",
     "@types/argon2-browser": "^1.18.4",
-    "@types/bcrypt": "^5.0.2",
+    "@types/bcrypt": "^6.0.0",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "ajv-i18n": "^4.2.0",
     "ajv-keywords": "^5.1.0",
-    "argon2": "^0.43.0",
+    "argon2": "^0.44.0",
     "argon2-browser": "^1.18.0",
-    "bcrypt": "^5.1.1",
+    "bcrypt": "^6.0.0",
     "bcryptjs": "^3.0.2",
-    "chalk": "^5.4.1",
+    "chalk": "^5.6.2",
     "consola": "^3.4.2",
-    "dayjs": "^1.11.13",
-    "zod": "^3.25.63"
+    "dayjs": "^1.11.18",
+    "decimal.js": "^10.6.0",
+    "zod": "^4.1.8"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/cn/ChineseResidentIdNo.mod.ts

@@ -0,0 +1,7 @@
+export {
+	ChineseResidentIdNoRegex as regex,
+	parseChineseResidentIdNo as parse,
+	formatChineseResidentIdNo as format,
+	type ParsedChineseResidentIdNo as Result,
+	ParsedChineseResidentIdNoSchema as ResultSchema,
+} from './ChineseResidentIdNo';

package/src/cn/ChineseResidentIdNo.test.ts

@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest';
+import { ChineseResidentIdNo } from './mod';
+
+describe('ChineseResidentIdNo', () => {
+	it('should parse', () => {
+		for (const a of ['11010519491231002X']) {
+			let out = ChineseResidentIdNo.parse(a);
+			expect(out).toBeTruthy();
+			expect(ChineseResidentIdNo.format(out!)).toBe(a);
+			expect(out).toMatchSnapshot();
+		}
+	});
+	it('should format with partial', () => {
+		expect(ChineseResidentIdNo.format({ addressCode: '110105', birthDate: new Date('1949-12-31'), sequence: 2 })).toBe(
+			'11010519491231002X',
+		);
+	});
+});

package/src/cn/ChineseResidentIdNo.ts

@@ -0,0 +1,66 @@
+import { z } from 'zod/v4';
+import { SexType, SexTypeSchema } from '../foundation/schema';
+import { Mod11 } from './Mod11';
+
+export const ChineseResidentIdNoRegex =
+	/^(?<division>[1-9]\d{5})(?<year>(18|19|20)\d{2})(?<month>0[1-9]|1[0-2])(?<day>0[1-9]|[12]\d|3[01])(?<sequence>\d{3})(?<checkDigit>[0-9Xx])$/;
+
+export type ParsedChineseResidentIdNo = z.infer<typeof ParsedChineseResidentIdNoSchema>;
+export const ParsedChineseResidentIdNoSchema = z
+	.object({
+		raw: z.string().regex(ChineseResidentIdNoRegex, '无效的18位身份证号码格式').describe('身份证号码'),
+		addressCode: z.string().length(6).describe('地址码 '),
+		birthDate: z.iso.date().describe('出生日期'),
+		sequence: z.int().max(999).min(0).describe('顺序码'),
+		checkDigit: z.int().min(0).max(10).describe('校验码'),
+		sex: SexTypeSchema.describe('性别'),
+		age: z.number().optional(),
+		valid: z.boolean().optional().describe('是否有效'),
+	})
+	.describe('居民身份证号码解析内容');
+
+export function parseChineseResidentIdNo(idNo: string): ParsedChineseResidentIdNo | undefined {
+	const reg = ChineseResidentIdNoRegex;
+	const match = idNo.match(reg);
+	if (!match || !match.groups) {
+		return undefined;
+	}
+	const { division, year, month, day, sequence, checkDigit } = match.groups;
+	let seq = parseInt(sequence, 10);
+	return {
+		raw: idNo,
+		addressCode: division,
+		birthDate: `${year}-${month}-${day}`,
+		sequence: seq,
+		checkDigit: checkDigit.toUpperCase() === 'X' ? 10 : parseInt(checkDigit),
+		sex: seq % 2 === 0 ? SexType.Male : SexType.Female,
+		age: new Date().getFullYear() - parseInt(year, 10),
+		valid: Mod11.validate(idNo),
+	};
+}
+
+export function formatChineseResidentIdNo({
+	addressCode,
+	birthDate,
+	sequence,
+	checkDigit,
+}: {
+	addressCode: string;
+	birthDate: string | Date;
+	sequence: number | string;
+	checkDigit?: string | number;
+}): string {
+	const date =
+		typeof birthDate === 'string'
+			? birthDate.replace(/-/g, '')
+			: `${birthDate.getFullYear()}${String(birthDate.getMonth() + 1).padStart(2, '0')}${String(birthDate.getDate()).padStart(2, '0')}`;
+	const seq = String(sequence).padStart(3, '0');
+	const major = `${addressCode}${date}${seq}`;
+	const check =
+		typeof checkDigit === 'number'
+			? checkDigit === 10
+				? 'X'
+				: String(checkDigit)
+			: checkDigit?.toUpperCase() || Mod11.compute(major);
+	return `${major}${check}`;
+}

package/src/cn/DivisionCode.mod.ts

@@ -0,0 +1,7 @@
+export {
+	DivisionCodeRegex as regex,
+	type ParsedDivisionCode as Result,
+	ParsedDivisionCodeSchema as ResultSchema,
+	parseDivisionCode as parse,
+	formatDivisionCode as format,
+} from './DivisionCode';

package/src/cn/DivisionCode.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { DivisionCode } from './DivisionCode';
+import { DivisionCode } from './mod';
 
 describe('DivisionCode', () => {
 	it('should parse', () => {
@@ -7,27 +7,17 @@ describe('DivisionCode', () => {
 			[
 				'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' }],
+			[441900, { codes: ['44', '19', '00'] }],
+			['31', { codes: ['31'] }],
 			['4', undefined],
 			['', undefined],
 			[null, undefined],