@wener/utils 1.1.47 → 1.1.49

package/src/cn/division/DivisionCode.ts

@@ -39,14 +39,8 @@ const DivisionCodeLevels = [
  *
  * @see https://zh.wikipedia.org/wiki/GB/T_2260 中华人民共和国行政区划代码
  */
-export class DivisionCode {
-  static Levels = DivisionCodeLevels;
-
-  private static instance: DivisionCode;
-
-  static get() {
-    return this.instance || (this.instance = new DivisionCode());
-  }
+export class DivisionCodeFormat {
+  static levels = DivisionCodeLevels;
 
   regex = /^(?<province>\d{2})(?<city>\d{2})?(?<county>\d{2})?(?<town>\d{3})?(?<village>\d{3})?$/;
 
@@ -87,6 +81,63 @@ export class DivisionCode {
     [82, '澳门特别行政区'],
     // 9 国外
   ];
+
+  parse(code: string) {
+    if (!code) return;
+    const { regex } = this;
+    const match = regex.exec(code);
+    if (!match) return;
+    const { province, city, county, town, village } = match.groups ?? {};
+    if (!province) return;
+
+    return {
+      province,
+      city,
+      county,
+      town,
+      village,
+    };
+  }
+}
+
+interface DivisionTreeNode {
+  sub: string; // sub code
+  children?: Record<string, DivisionTreeNode>;
+
+  code: string; // full code
+  name?: string; // name of division
+}
+
+export type DivisionCodeLevel = 'Village' | 'Town' | 'County' | 'City' | 'Province';
+
+export interface ParsedDivisionCode {
+  level: DivisionCodeLevel;
+  code: string;
+  name?: string;
+  fullName?: string;
+  names: string[];
+  // 村级（村委会、居委会）
+  // 12 位
+  village?: CodeName;
+  // 乡级（乡镇、街道）
+  // 9 位
+  town?: CodeName;
+  // 县级（区县）
+  // 6 位 - 常用 - 2985 个
+  county?: CodeName;
+  // 地级（城市）
+  // 4 位 - 343 个
+  city?: CodeName;
+  // 省级（省份、直辖市、自治区）
+  // 2 位 - 32 个
+  province: CodeName;
+
+  children?: Array<{ code: string; name?: string }>;
+}
+
+export interface CodeName {
+  code: string;
+  name: string;
 }
 
 // export function getSimpleProvinceLabel(value: string) {
@@ -100,3 +151,5 @@ export class DivisionCode {
 //   }
 //   return label.replace(/省|市|(回族|维吾尔|壮族)?自治区|特别行政区$/, '');
 // }
+
+export const DivisionCode = new DivisionCodeFormat();

package/src/cn/division/division.test.ts

@@ -0,0 +1,6 @@
+import { test } from 'vitest';
+import { DivisionCode } from './DivisionCode';
+
+test('division', () => {
+  console.log(DivisionCode.parse('441900003001'));
+});

package/src/cn/id/{Mod11Checksum.ts → Mod11.ts}

@@ -3,13 +3,8 @@
  */
 export class Mod11Checksum {
   weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2, 1];
-  private static instance: Mod11Checksum;
 
-  static get() {
-    return this.instance || (this.instance = new Mod11Checksum());
-  }
-
-  verify(s: string) {
+  validate(s: string) {
     return s.at(-1) === this.generate(s.slice(0, s.length - 1));
   }
 
@@ -27,3 +22,5 @@ export class Mod11Checksum {
     }
   }
 }
+
+export const Mod11 = new Mod11Checksum();

package/src/cn/id/ResidentIdNumber.ts

@@ -1,7 +1,7 @@
-import { Mod11Checksum } from './Mod11Checksum';
+import { Mod11 } from './Mod11';
 
-export class ResidentIdNumber {
-  checksum = Mod11Checksum.get();
+class ResidentIdNumberFormat {
+  checksum = Mod11;
 
   // 9 https://zh.wikipedia.org/wiki/中华人民共和国外国人永久居留身份证
   // 9 标识码
@@ -11,19 +11,15 @@ export class ResidentIdNumber {
   regex =
     /^(?<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})(?<checksum>[0-9Xx])$/;
 
-  private static instance: ResidentIdNumber;
-
-  static get() {
-    return (this.instance ||= new ResidentIdNumber());
-  }
-
-  verify(s: string) {
+  validate(s: string) {
     if (!s) return false;
-    return this.regex.test(s) && this.checksum.verify(s.toUpperCase());
+    return this.regex.test(s) && this.checksum.validate(s.toUpperCase());
   }
 
+  generate(opts: { sex?: 'Male' | 'Female'; age?: number; birthDate?: Date; division?: string }) {}
+
   parse(s: string): IdNumber | undefined {
-    if (!this.verify(s)) {
+    if (!this.validate(s)) {
       return;
     }
 
@@ -86,7 +82,7 @@ class IdNumber {
   }
 
   get valid() {
-    return ResidentIdNumber.get().verify(this.toString());
+    return ResidentIdNumber.validate(this.toString());
   }
 
   get male() {
@@ -126,3 +122,5 @@ function formatDate(date: Date, format = 'YYYYMMDD') {
       throw new Error(`Invalid format`);
   }
 }
+
+export const ResidentIdNumber = new ResidentIdNumberFormat();

package/src/cn/id/id.test.ts

@@ -1,19 +1,19 @@
 import { assert, expect, test } from 'vitest';
-import { Mod11Checksum } from './Mod11Checksum';
+import { Mod11 } from './Mod11';
 import { ResidentIdNumber } from './ResidentIdNumber';
 
 test('id', (t) => {
   const ids = ['11010519491231002X', '11010219840406970X'];
 
-  let cs = Mod11Checksum.get();
+  let cs = Mod11;
   for (const id of ids) {
     assert.equal(cs.generate(id.slice(0, -1)), id.at(-1));
   }
 
-  let parse = ResidentIdNumber.get().parse(ids[0]);
-  expect(parse?.toObject()).toEqual({
+  let parse = ResidentIdNumber.parse(ids[0]);
+  expect(parse?.toObject()).toMatchObject({
     division: '110105',
-    date: new Date('1949-12-31'),
+    birthDate: new Date('1949-12-31'),
     sequence: 2,
     checksum: 'X',
   });

package/src/cn/scripts/gen.test.ts

@@ -15,7 +15,8 @@ test(
     timeout: 1000 * 60 * 30,
   },
   async () => {
-    await generate();
+    // missing parent 4419003 for 441900003001
+    // await generate();
   },
 );
 

package/src/cn/types.ts

@@ -0,0 +1,11 @@
+export interface StringFormat<GenerateOptions, ParsedObject> {
+  regex?: RegExp;
+  validate: (s: string) => boolean;
+  generate: (opts?: GenerateOptions) => ParsedObject;
+  parse: (s: string) => ParsedObject | undefined;
+}
+
+export interface StringChecksum {
+  validate: (s: string) => boolean;
+  generate: (s: string) => string;
+}

package/src/cn/uscc/{Mod31Checksum.ts → Mod31.ts}

@@ -14,12 +14,6 @@ export class Mod31Checksum {
     {} as Record<string, number>,
   );
 
-  private static instance: Mod31Checksum;
-
-  static get() {
-    return this.instance || (this.instance = new Mod31Checksum());
-  }
-
   toChar(n: number) {
     return this.chars[n];
   }
@@ -28,7 +22,7 @@ export class Mod31Checksum {
     return this.numbers[c];
   }
 
-  verify(s: string) {
+  validate(s: string) {
     return s.at(-1) === this.generate(s.slice(0, s.length - 1));
   }
 
@@ -40,3 +34,5 @@ export class Mod31Checksum {
     return this.toChar(31 - (sum % 31));
   }
 }
+
+export const Mod31 = new Mod31Checksum();

package/src/cn/uscc/USCC.ts

@@ -1,4 +1,4 @@
-import { Mod31Checksum } from './Mod31Checksum';
+import { Mod31 } from './Mod31';
 
 /**
  * - GB 32100-2015 法人和其他组织统一社会信用代码编码规则
@@ -8,7 +8,7 @@ import { Mod31Checksum } from './Mod31Checksum';
  *
  * @see https://en.wikipedia.org/wiki/Unified_Social_Credit_Identifier
  */
-export class USCC {
+export class UnifiedSocialCreditCodeFormat {
   registryCodeLabels: Record<string, Code> = {
     1: {
       label: '机构编制',
@@ -47,13 +47,7 @@ export class USCC {
 
   /* 16 位 */
   regex = /^([159][1239]|Y1)[0-9]{6}[0-9A-HJ-NP-RTUWXY]{10}$/; // 无 I O Z S V
-  checksum = Mod31Checksum.get();
-
-  static instance: USCC;
-
-  static get() {
-    return (this.instance ||= new USCC());
-  }
+  checksum = Mod31;
 
   parse(s: string): ParsedUSCC {
     let registryCode = s[0];
@@ -71,8 +65,8 @@ export class USCC {
     };
   }
 
-  verify(s: string) {
-    return this.regex.test(s) && this.checksum.verify(s);
+  validate(s: string) {
+    return this.regex.test(s) && this.checksum.validate(s);
   }
 }
 
@@ -96,3 +90,5 @@ interface ParsedUSCC {
   // 校验码
   checksum: string;
 }
+
+export const USCC = new UnifiedSocialCreditCodeFormat();

package/src/cn/uscc/isUSCC.ts

@@ -4,5 +4,5 @@ import { USCC } from './USCC';
  * USCC - 统一社会信用代码
  */
 export function isUSCC(s: string) {
-  return USCC.get().verify(s);
+  return USCC.validate(s);
 }

package/src/cn/uscc/uscc.test.ts

@@ -1,16 +1,16 @@
 import { expect, test } from 'vitest';
 import { isUSCC } from './isUSCC';
-import { Mod31Checksum } from './Mod31Checksum';
+import { Mod31 } from './Mod31';
 import { USCC } from './USCC';
 
 test('uscc', () => {
-  let cs = Mod31Checksum.get();
+  let cs = Mod31;
 
   // 阿里云计算
-  expect(cs.verify('91330106673959654P')).toBeTruthy();
+  expect(cs.validate('91330106673959654P')).toBeTruthy();
   expect(cs.generate('91330106673959654')).toBe('P');
 
   expect(isUSCC('91330106673959654P')).toBeTruthy();
 
-  console.log(USCC.get().parse('91330106673959654P'));
+  console.log(USCC.parse('91330106673959654P'));
 });

package/src/crypto/getNodeCrypto.ts

@@ -1,17 +1,22 @@
-let nodeCrypto: Awaited<typeof import('node:crypto')>;
+// import type * as NodeCrypto from 'node:crypto';
+import { getGlobalThis } from '../runtime/getGlobalThis';
+
+let nodeCrypto;
 // globalThis.process?.release?.name
 
+// avoid import node
 // avoid process.browser
-if (typeof window === 'undefined') {
-  try {
-    // avoid `node:` UnhandledSchemeError https://github.com/vercel/next.js/issues/28774
-    if (typeof require === 'undefined') {
-      void import('crypto').then((v) => (nodeCrypto = v.default));
-    } else {
-      nodeCrypto = require('crypto');
-    }
-  } catch (e) {}
-}
+// if (typeof window === 'undefined') {
+//   try {
+//     // avoid `node:` UnhandledSchemeError https://github.com/vercel/next.js/issues/28774
+//     if (typeof require === 'undefined') {
+//       void import('crypto').then((v) => (nodeCrypto = v.default));
+//     } else {
+//       nodeCrypto = require('crypto');
+//     }
+//   } catch (e) {}
+// }
 export function getNodeCrypto() {
+  nodeCrypto ||= getGlobalThis().crypto;
   return nodeCrypto;
 }

package/src/crypto/getRandomValues.ts

@@ -4,10 +4,15 @@ import { getGlobalThis } from '../runtime/getGlobalThis';
 import { getNodeCrypto } from './getNodeCrypto';
 
 const globalThis = getGlobalThis();
+
+// chrome 11+, safari 5+, nodejs 17.4+
+// https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
 export let getRandomValues: <T extends Exclude<TypedArray, Float32Array | Float64Array>>(typedArray: T) => T =
   globalThis.crypto?.getRandomValues?.bind(globalThis.crypto) ||
   (globalThis as any).msCrypto?.getRandomValues?.bind((globalThis as any).msCrypto) ||
-  _getRandomValues;
+  (() => {
+    throw new Error('[getRandomValues]: No secure random number generator available.');
+  });
 
 function _getRandomValues<T extends Exclude<TypedArray, Float32Array | Float64Array>>(buf: T) {
   const nodeCrypto = getNodeCrypto();

package/src/emitter/types.ts

@@ -0,0 +1,18 @@
+export type EventType = string | symbol;
+
+export type Handler<E extends keyof T, T = Record<string, unknown>> = (evt: { type: E; payload: T[E] }) => void;
+export type WildcardHandler<T = Record<string, unknown>> = <E extends keyof T>(evt: { type: E; payload: T[E] }) => void;
+
+export interface Emitter<Events extends Record<EventType, unknown>> {
+  on<Key extends keyof Events>(type: Key, handler: Handler<Key, Events>): void;
+
+  on(type: '*', handler: WildcardHandler<Events>): void;
+
+  off<Key extends keyof Events>(type: Key, handler?: Handler<Key, Events>): void;
+
+  off(type: '*', handler: WildcardHandler<Events>): void;
+
+  emit<Key extends keyof Events>(type: Key, event: Events[Key]): void;
+
+  emit<Key extends keyof Events>(type: undefined extends Events[Key] ? Key : never): void;
+}

package/src/fetch/createFetchWith.ts

@@ -1,4 +1,4 @@
-import { MaybePromise } from '../asyncs/MaybePromise';
+import type { MaybePromise } from '../asyncs/MaybePromise';
 import { getGlobalThis } from '../runtime/getGlobalThis';
 import { type FetchLike } from './types';
 

package/src/fetch/createFetchWithRetry.ts

@@ -1,5 +1,5 @@
 import { getGlobalThis } from '../runtime/getGlobalThis';
-import { FetchLike } from './types';
+import type { FetchLike } from './types';
 
 type RequestDelayFunction = (attempt: number, error: Error | null, response: Response | null) => number;
 type RequestRetryOnFunction = (

package/src/fetch/http.types.ts

@@ -0,0 +1,46 @@
+// from hono
+
+export type InfoStatusCode = 100 | 101 | 102 | 103;
+export type SuccessStatusCode = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226;
+export type DeprecatedStatusCode = 305 | 306;
+export type RedirectStatusCode = 300 | 301 | 302 | 303 | 304 | DeprecatedStatusCode | 307 | 308;
+export type ClientErrorStatusCode =
+  | 400
+  | 401
+  | 402
+  | 403
+  | 404
+  | 405
+  | 406
+  | 407
+  | 408
+  | 409
+  | 410
+  | 411
+  | 412
+  | 413
+  | 414
+  | 415
+  | 416
+  | 417
+  | 418
+  | 421
+  | 422
+  | 423
+  | 424
+  | 425
+  | 426
+  | 428
+  | 429
+  | 431
+  | 451;
+export type ServerErrorStatusCode = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511;
+
+export type UnofficialStatusCode = -1;
+export type StatusCode =
+  | InfoStatusCode
+  | SuccessStatusCode
+  | RedirectStatusCode
+  | ClientErrorStatusCode
+  | ServerErrorStatusCode
+  | UnofficialStatusCode;

package/src/index.ts

@@ -1,3 +1,5 @@
+import { Promises } from './asyncs/Promises';
+
 // arrays
 export {
   firstOfMaybeArray,
@@ -25,10 +27,10 @@ export { firstOfAsyncIterator } from './asyncs/firstOfAsyncIterator';
 export { nextOfAsyncIterator } from './asyncs/nextOfAsyncIterator';
 export { isIterator } from './asyncs/isIterator';
 
-export { sleep } from './asyncs/sleep';
+export { Promises } from './asyncs/Promises';
+export const sleep = Promises.sleep;
+export const isPromise = Promises.isPromise;
 export { timeout, TimeoutError } from './asyncs/timeout';
-export { isPromise } from './asyncs/isPromise';
-// export * from './async/promiseOfCallback';
 
 // langs
 export { shallowEqual } from './langs/shallowEqual';
@@ -45,6 +47,8 @@ export { maybeFunction, type MaybeFunction } from './langs/MaybeFunction';
 export { memoize } from './langs/memoize';
 export { mixin } from './langs/mixin';
 export type { MixinFunction, MixinInstance, MixinReturnValue } from './langs/mixin';
+export { getObjectId } from './langs/getObjectId';
+export { getGlobalStates, setGlobalStates } from './langs/getGlobalStates';
 
 export { AsyncCloser } from './runtime/AsyncCloser';
 export { Closer } from './runtime/Closer';

package/src/io/ArrayBuffers.ts

@@ -157,7 +157,7 @@ export class ArrayBuffers {
     return this.toUint8Array(ArrayBuffers.from(v, 'hex'));
   };
 
-  static resize = (v: ArrayBufferLike, newByteLength?: number, maxByteLength?: number): ArrayBuffer => {
+  static resize = (v: ArrayBuffer, newByteLength?: number, maxByteLength?: number): ArrayBuffer => {
     if (newByteLength === undefined || newByteLength === null) {
       return v;
     }
@@ -167,7 +167,7 @@ export class ArrayBuffers {
       if ('resizable' in v && v.resizable) {
         if ('maxByteLength' in v && typeof v.maxByteLength === 'number' && v.maxByteLength >= newByteLength) {
           v.resize(newByteLength);
-          return v;
+          return v as ArrayBuffer;
         }
       }
     }
@@ -367,7 +367,7 @@ export class ArrayBuffers {
   //   return a;
   // };
 
-  static concat = (buffers: Array<BufferSource>, result?: ArrayBuffer, offset = 0) => {
+  static concat = (buffers: Array<BufferSource>, result?: ArrayBuffer, offset = 0): ArrayBuffer => {
     // https://stackoverflow.com/questions/10786128/appending-arraybuffers
 
     const length = buffers.reduce((a, b) => a + b.byteLength, 0);
@@ -422,6 +422,10 @@ declare global {
     resizable?: boolean;
   }
 
+  interface ArrayBufferConstructor {
+    new (byteLength: number, opts?: { maxByteLength?: number }): ArrayBuffer;
+  }
+
   interface SharedArrayBuffer {
     resize?: (newByteLength: number) => void;
     resizable?: boolean;

package/src/io/ByteBuffer.test.ts

@@ -1,8 +1,8 @@
-import { assert, test } from 'vitest';
+import { assert, describe, test } from 'vitest';
 import { ByteBuffer } from './ByteBuffer';
 
-test('ByteBuffer', async () => {
-  {
+describe('ByteBuffer', async () => {
+  test('base', () => {
     let buf = new ByteBuffer();
     buf.writeString('Hello');
     buf.writeString('World');
@@ -12,9 +12,36 @@ test('ByteBuffer', async () => {
     assert.equal(buf.length, 5);
     buf.position = 0;
     assert.equal(buf.readString(5), 'Hello');
-  }
-  {
+  });
+
+  test('overflow max length', () => {
     let buf = new ByteBuffer();
     buf.writeBytes(new Uint8Array(1025));
-  }
+    assert.equal(buf.length, 1025);
+  });
+
+  test('overflow max length tow step', () => {
+    let buf = new ByteBuffer();
+    buf.writeBytes(new Uint8Array(1023));
+    buf.writeBytes(new Uint8Array(2));
+    assert.equal(buf.length, 1025);
+    console.log(`Max`, (buf.buffer as any).maxByteLength);
+  });
+
+  test('writeBytes fill zero', () => {
+    let buf = new ByteBuffer();
+    buf.writeBytes(new Uint8Array([1, 2]));
+    buf.position = 0;
+    // console.log('->', buf.position, buf.length, buf.remaining());
+    // console.log(toHexDump(buf.buffer));
+
+    // truncate to size fill zero
+    buf.writeBytes(new Uint8Array([1]), 10);
+    // console.log('->', buf.position, buf.length, buf.remaining());
+    // console.log(toHexDump(buf.buffer));
+
+    assert.equal(buf.view.getInt8(0), 1);
+    assert.equal(buf.view.getInt8(1), 0);
+    assert.equal(buf.length, 10);
+  });
 });