refactor: upgrade deps, improve naming and perform micro optimizations

CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.21.0
+
+- Dependencies updated.
+- Naming improved.
+- Micro optimizations performed.
+
 v0.20.0
 
 - Code refactor

package.json

@@ -1,6 +1,6 @@
 {
   "name": "muninn",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "It parses the html and collects the requested data as desired.",
   "main": "build/index.js",
   "scripts": {

src/parser/getArrayValue.ts

@@ -23,6 +23,7 @@ function getArrayValue<Initial = unknown>(
   }
 
   $(elems).each((index, el) => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { selector, type, ...rest } = config;
     const value = getValue(
       { $, el: $(el) },

src/parser/getSchemaValue.ts

@@ -8,18 +8,18 @@ function getSchemaValue<Initial = unknown>(
   { $, el }: ElementPassArg,
   config: Schema<Initial>
 ): Record<keyof Exclude<typeof config, SchemaGenerator>['schema'], unknown> {
-  const value = Object.keys(config).reduce((values, key) => {
+  return Object.keys(config).reduce((values, key) => {
     const conf = config[key];
-    const rawConf = getRawConfig(conf);
+    const rawConfig = getRawConfig(conf);
 
-    if (Array.isArray(rawConf)) {
-      for (const rconf of rawConf) {
+    if (Array.isArray(rawConfig)) {
+      for (const rconf of rawConfig) {
         const currentRawConfig = getConfig({ $, el }, rconf);
 
-        const val = getValue({ $, el }, currentRawConfig);
+        const value = getValue({ $, el }, currentRawConfig);
 
-        if (val !== null && val !== undefined) {
-          values[key] = val;
+        if (value !== null && value !== undefined) {
+          values[key] = value;
           break;
         }
       }
@@ -31,14 +31,12 @@ function getSchemaValue<Initial = unknown>(
       return values;
     }
 
-    const currentRawConfig = getConfig({ $, el }, rawConf);
+    const currentRawConfig = getConfig({ $, el }, rawConfig);
 
     values[key] = getValue({ $, el }, currentRawConfig);
 
     return values;
   }, {});
-
-  return value;
 }
 
 export default getSchemaValue;

src/parser/getSimpleValue.ts

@@ -19,19 +19,17 @@ function getSimpleValue<Initial = unknown>(
 
   if (html) {
     value = element.html();
-  } else if (attr) {
-    if (Array.isArray(attr)) {
-      value = attr.reduce((acc, arg) => {
-        acc[arg] = element.attr(arg);
-        return acc;
-      }, {});
-    } else if (attr === '$all') {
-      value = element.attr();
-    } else {
-      value = element.attr(attr);
-    }
-  } else {
+  } else if (!attr) {
     value = element.text();
+  } else if (Array.isArray(attr)) {
+    value = attr.reduce((acc, arg) => {
+      acc[arg] = element.attr(arg);
+      return acc;
+    }, {});
+  } else if (attr === '$all') {
+    value = element.attr();
+  } else {
+    value = element.attr(attr);
   }
 
   if (initial && !value) {

src/parser/parse.ts

@@ -15,21 +15,19 @@ function parse<Initial = unknown>(
     $ = data;
   }
 
-  const rawConf = getRawConfig(config);
+  const rawConfig = getRawConfig(config);
 
-  if (Array.isArray(rawConf)) {
-    for (const conf of rawConf) {
+  if (Array.isArray(rawConfig)) {
+    for (const conf of rawConfig) {
       const value = getValue({ $, el: $ }, conf);
 
-      if (value !== null) {
-        return value;
-      }
+      if (value !== null) return value;
     }
 
     return null;
   }
 
-  return getValue({ $ }, rawConf);
+  return getValue({ $ }, rawConfig);
 }
 
 export default parse;

src/parser/transformValue.ts

@@ -12,11 +12,11 @@ function transformValue<Initial = unknown>(
   const { trim, regex, type, methods = [], transform } = config;
 
   if (typeof value === 'string' && trim !== false) {
-    value = value.trim();
-
     if (regex) {
       value = execRegex(value, regex);
     }
+
+    if (value) value = value.trim();
   }
 
   if (type) {