json-with-bigint 2.0.0 → 2.1.0

package/README.md

@@ -57,7 +57,7 @@ const userData = {
 
 localStorage.setItem('userData', JSONStringify(userData));
 
-const restoredUserData = JSONParse(localStorage.getItem('userData'));
+const restoredUserData = JSONParse(localStorage.getItem('userData') || '');
 ```
 
 ### CDN
@@ -78,7 +78,7 @@ and use it
 
   localStorage.setItem('userData', JSONStringify(userData));
 
-  const restoredUserData = JSONParse(localStorage.getItem('userData'));
+  const restoredUserData = JSONParse(localStorage.getItem('userData') || '');
 </script>
 ```
 
@@ -95,7 +95,7 @@ Download json-with-bigint.min.js from this repository to your project's folder a
 
   localStorage.setItem('userData', JSONStringify(userData));
 
-  const restoredUserData = JSONParse(localStorage.getItem('userData'));
+  const restoredUserData = JSONParse(localStorage.getItem('userData') || '');
 </script>
 ```
 

package/json-with-bigint.d.ts

@@ -1,3 +1,20 @@
-export function JSONStringify(data: any): string | undefined;
+export type Json =
+  | null
+  | undefined
+  | string  
+  | number
+  | bigint
+  | boolean
+  | JsonObject
+  | {}
+  | JsonArray;
 
-export function JSONParse(serializedData: string): any;
+interface JsonObject {
+  [x: string]: Json;
+}
+
+interface JsonArray extends Array<Json> {}
+
+export function JSONStringify(data: Json): string;
+
+export function JSONParse<T extends Json = Json>(serializedData: string): T;

package/json-with-bigint.js

@@ -1,6 +1,6 @@
 /* 
   Function to serialize data to JSON string
-  Converts BigInt values to custom format (strings with "n" at the end) and then converts them to proper big integers in JSON string
+  Converts BigInt values to custom format (strings with digits and "n" at the end) and then converts them to proper big integers in JSON string
 */
 export const JSONStringify = (data) => {
   const bigInts = /([\[:])?"(\d+)n"([,\}\]])/g;
@@ -14,18 +14,19 @@ export const JSONStringify = (data) => {
 
 /* 
   Function to parse JSON
-  If JSON has values presented in a lib's custom format (strings with "n" character at the end), we just parse them to BigInt values (for backward compatibility with previous versions of the lib)
+  If JSON has values presented in a lib's custom format (strings with digits and "n" character at the end), we just parse them to BigInt values (for backward compatibility with previous versions of the lib)
   If JSON has values greater than Number.MAX_SAFE_INTEGER, we convert those values to our custom format, then parse them to BigInt values.
   Other types of values are not affected and parsed as native JSON.parse() would parse them.
+
+  Big numbers are found and marked using RegEx with these conditions:
+    - Before the match there's : OR :[ OR :[anyNumberOf(anyCharacters)
+    - The match itself has more than 16 digits OR (16 digits and any digit of the number is greater than that of the Number.MAX_SAFE_INTEGER)
+    - After the match there's , OR } OR ]
 */
 export const JSONParse = (json) => {
-  /*
-    Big numbers are found and marked using Regex with this condition:
-    Number's length is bigger than 16 || Number's length is 16 and any numerical digit of the number is greater than that of the Number.MAX_SAFE_INTEGER
-  */
   const numbersBiggerThanMaxInt =
-    /([\[:])?(\d{17,}|(?:[9](?:[1-9]07199254740991|0[1-9]7199254740991|00[8-9]199254740991|007[2-9]99254740991|007199[3-9]54740991|0071992[6-9]4740991|00719925[5-9]740991|007199254[8-9]40991|0071992547[5-9]0991|00719925474[1-9]991|00719925474099[2-9])))([,\}\]])/g;
-  const serializedData = json.replace(numbersBiggerThanMaxInt, '$1"$2n"$3');
+    /(?<=:|:\[|:\[.*)(\d{17,}|(?:[9](?:[1-9]07199254740991|0[1-9]7199254740991|00[8-9]199254740991|007[2-9]99254740991|007199[3-9]54740991|0071992[6-9]4740991|00719925[5-9]740991|007199254[8-9]40991|0071992547[5-9]0991|00719925474[1-9]991|00719925474099[2-9])))(?=[,\}\]])/g;
+  const serializedData = json.replace(numbersBiggerThanMaxInt, '"$1n"');
 
   return JSON.parse(serializedData, (_, value) => {
     const isCustomFormatBigInt =

package/json-with-bigint.min.js

@@ -1 +1 @@
-export const JSONStringify=t=>JSON.stringify(t,((t,n)=>"bigint"==typeof n?n.toString()+"n":n)).replace(/([\[:])?"(\d+)n"([,\}\]])/g,"$1$2$3");export const JSONParse=t=>{const n=t.replace(/([\[:])?(\d{17,}|(?:[9](?:[1-9]07199254740991|0[1-9]7199254740991|00[8-9]199254740991|007[2-9]99254740991|007199[3-9]54740991|0071992[6-9]4740991|00719925[5-9]740991|007199254[8-9]40991|0071992547[5-9]0991|00719925474[1-9]991|00719925474099[2-9])))([,\}\]])/g,'$1"$2n"$3');return JSON.parse(n,((t,n)=>"string"==typeof n&&n.match(/^\d+n$/)?BigInt(n.substring(0,n.length-1)):n))};
+export const JSONStringify=t=>JSON.stringify(t,((t,n)=>"bigint"==typeof n?n.toString()+"n":n)).replace(/([\[:])?"(\d+)n"([,\}\]])/g,"$1$2$3");export const JSONParse=t=>{const n=t.replace(/(?<=:|:\[|:\[.*)(\d{17,}|(?:[9](?:[1-9]07199254740991|0[1-9]7199254740991|00[8-9]199254740991|007[2-9]99254740991|007199[3-9]54740991|0071992[6-9]4740991|00719925[5-9]740991|007199254[8-9]40991|0071992547[5-9]0991|00719925474[1-9]991|00719925474099[2-9])))(?=[,\}\]])/g,'"$1n"');return JSON.parse(n,((t,n)=>"string"==typeof n&&n.match(/^\d+n$/)?BigInt(n.substring(0,n.length-1)):n))};

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "json-with-bigint",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "JS library that allows you to easily serialize and deserialize data with BigInt values",
-  "main": "json-with-bigint.js",
+  "type": "module",
+  "exports": "./json-with-bigint.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/Ivan-Korolenko/json-with-bigint"