@tktb-tess/util-fns 0.2.0 → 0.2.1

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "@tktb-tess/util-fns",
-  "version": "0.2.0",
+  "version": "0.2.1",
+  "description": "utility functions for personal use",
   "main": "dist/main.js",
   "type": "module",
+  "author": "Tessyrrhaqt",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tktb-tess/util-fns"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -10,9 +17,6 @@
     "build": "rm -r -f dist && rollup -c",
     "test": "npx tsx test/main.test.ts"
   },
-  "author": "Tessyrrhaqt",
-  "license": "MIT",
-  "description": "utility functions for personal use",
   "devDependencies": {
     "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-node-resolve": "^16.0.1",

package/src/fraction.ts

@@ -1,6 +1,12 @@
 import { exEuclidean } from './math';
 const __fraction_brand = Symbol();
 
+export type FractionData = {
+  type: 'Fraction';
+  numerator: string;
+  denominator: string;
+};
+
 export default class Fraction {
   #numerator: bigint;
   #denominator: bigint;
@@ -36,7 +42,11 @@ export default class Fraction {
     if (isNegative) value *= -1;
 
     const a_0 = BigInt(Math.floor(value));
-    value = 1 / (value - Number(a_0));
+    const fracPart = value - Number(a_0);
+    if (fracPart === 0) {
+      return new Fraction(isNegative ? -a_0 : a_0, 1n);
+    }
+    value = 1 / fracPart;
 
     // 漸化式 参考: https://tsujimotter.hatenablog.com/entry/continued-fraction
     // p_0 = 1, p_1 = a_0, p_{n+2} = a_{n+1} * p_{n+1} + p_n
@@ -46,9 +56,16 @@ export default class Fraction {
 
     while (`${q_n1}`.length < denominatorDigits + 1) {
       const a_n1 = BigInt(Math.floor(value));
-      value = 1 / (value - Number(a_n1));
+      const fracPart = value - Number(a_n1);
+
       [p_n, p_n1] = [p_n1, a_n1 * p_n1 + p_n];
       [q_n, q_n1] = [q_n1, a_n1 * q_n1 + q_n];
+
+      if (fracPart === 0) {
+        return new Fraction(isNegative ? -p_n1 : p_n1, q_n1);
+      }
+
+      value = 1 / fracPart;
     }
     return new Fraction(isNegative ? -p_n : p_n, q_n);
   }
@@ -58,8 +75,10 @@ export default class Fraction {
    */
   #reduction() {
     const { gcd } = exEuclidean(this.#numerator, this.#denominator);
-    this.#numerator /= gcd;
-    this.#denominator /= gcd;
+    if (gcd !== 0n) {
+      this.#numerator /= gcd;
+      this.#denominator /= gcd;
+    }
   }
 
   /**
@@ -135,18 +154,41 @@ export default class Fraction {
    * @returns
    */
   toString() {
-    return `${this.#numerator}/${this.#denominator}`;
+    if (this.#numerator === 0n && this.#denominator === 0n) {
+      return `NaN`;
+    } else if (this.#numerator === 0n) {
+      return `0`;
+    } else if (this.#denominator === 0n) {
+      return this.#numerator < 0n ? `-Infinity` : `Infinity`;
+    } else if (this.#denominator === 1n) {
+      return `${this.#numerator}`;
+    } else {
+      return `${this.#numerator}/${this.#denominator}`;
+    }
   }
 
   valueOf() {
     return this.toDecimal();
   }
 
-  toJSON() {
+  toJSON(): FractionData {
     return {
       type: 'Fraction',
-      numerator: this.#numerator.toString(),
-      denominator: this.#denominator.toString(),
+      numerator: '0x' + this.#numerator.toString(16),
+      denominator: '0x' + this.#denominator.toString(16),
     };
   }
+
+  static parse(text: string) {
+    const parsed = JSON.parse(text);
+    const { type, numerator, denominator } = parsed;
+    if (type !== 'Fraction') throw Error('cannot parse');
+    if (typeof numerator === 'string' && typeof denominator === 'string') {
+      const num = BigInt(numerator);
+      const denom = BigInt(denominator);
+      return new Fraction(num, denom);
+    } else {
+      throw Error('cannot parse');
+    }
+  }
 }

package/src/math.ts

@@ -40,7 +40,9 @@ export const getRandBIByBitLength = (length: number, fixed = false) => {
 
   const byteLen = Math.ceil(length / 8);
   const buf = crypto.getRandomValues(Buffer.alloc(byteLen));
-  let result = buf.toString('binary').slice(0, length);
+  let result = Array.from(buf, (n) => n.toString(2).padStart(8, '0'))
+    .join('')
+    .slice(0, length);
 
   if (fixed) result = result.replace(/^./, '1');
   // console.log(result);
@@ -220,7 +222,7 @@ export const rot32BI = (value: bigint, rot: bigint) => {
  * @returns
  */
 export const rot32 = (value: number, rot: number) => {
-  return ((value >>> (rot & 31)) | (value << ((32 - rot) & 31))) >>> 0;
+  return ((value >>> (rot & 31)) | (value << (-rot & 31))) >>> 0;
 };
 
 /**