data processing improved

index.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosResponse } from 'axios';
+import axios from 'axios';
 import { parse } from 'node-html-parser';
 import * as fs from 'fs';
 
@@ -48,20 +48,24 @@ async function requestData(i: number): Promise<Element> {
 
     element.Name = captionParts[0];
     element.Symbol = captionParts[1].replace(/\d*/, "")
+    element.AtomicNumber = i;
 
     var tbody = infobox.querySelector("tbody");
     tbody.childNodes.forEach(s => {
         var tr = (s as any) as HTMLElement;
         if (tr.querySelector("th")?.hasAttribute("scope")) {
+
             var td = tr.querySelector("td");
             var th = tr.querySelector("th");
             head = decode(th?.innerHTML)
             body = decode(td?.innerHTML);
-            if (head.includes("Standard atomic weight")) head = "Standard atomic weight";
+
+            if (head.includes("atomic weight") || head.includes("Mass number")) head = "AtomicWeight";
             if (fields.has(head)) {
                 head = fields.get(head) as string;
-                body = regex.get(head)?.exec(body)?.toString() as string;
-                (element as any)[head] = body;
+                body = body.match(regex.get(head) != null ? regex.get(head) as RegExp : /.+/g)?.values().next().value as string;
+
+                (element as any)[head] = (isNaN(+body) ? body : Number.parseFloat(body));
             }
         }
     });

mappings.ts

@@ -1,35 +1,33 @@
 //used fields mapping
 var fields = new Map<string, string>();
 fields.set("Mass number", "AtomicWeight");
-fields.set("Standard atomic weight", "AtomicWeight");
-fields.set("Atomic number (Z)", "AtomicNumber");
+fields.set("AtomicWeight", "AtomicWeight");
 fields.set("Appearance", "Appearance");
-fields.set("Group", "Group"),
-    fields.set("Period", "Period");
+fields.set("Group", "Group");
+fields.set("Period", "Period");
 fields.set("Block", "Block");
 fields.set("Element category", "Category");
 fields.set("Electron configuration", "ElectronConfiguration");
 fields.set("Electrons per shell", "ElectronsPerShell");
 fields.set("Electronegativity", "Electronegativity");
 fields.set("Atomic radius", "AtomicRadius");
 fields.set("Covalent radius", "CovalentRadius");
-fields.set("Van der Waals radius", "AtomicRadius");
+fields.set("Van der Waals radius", "VdWRadius");
 fields.set("CAS Number", "CAS");
 
 var regex = new Map<string, RegExp>();
 regex.set("AtomicWeight", /\d+[.]?\d*/g);
-regex.set("AtomicNumber", /\d*/g);
-regex.set("Appearance", /\w*/g);
+regex.set("Appearance", /.+/g);
 regex.set("Group", /\d/g);
 regex.set("Period", /\d/g);
-regex.set("Block", /.*/g);
-regex.set("Category", /.*/g);
-regex.set("ElectronConfiguration", /.*/g);
-regex.set("ElectronsPerShell", /.*/g);
+regex.set("Block", /.+/g);
+regex.set("Category", /.+/g);
+regex.set("ElectronConfiguration", /.+/g);
+regex.set("ElectronsPerShell", /.+/g);
 regex.set("Electronegativity", /(?!Pauling scale: ?)\d+[.]?\d*/g);
-regex.set("CovalentRadius", /\d*/g);
-regex.set("AtomicRadius", /\d*/g);
-regex.set("AtomicRadius", /\d*/g);
-regex.set("CAS", /\d*-\d*-\d*/g);
+regex.set("CovalentRadius", /\d+/g);
+regex.set("AtomicRadius", /\d+/g);
+regex.set("VdWRadius", /\d+/g);
+regex.set("CAS", /\d+-\d+-\d+/g);
 
 export { fields, regex };