Merge 743e52b into 243061d

index.js

@@ -18,7 +18,30 @@ const cloneData = function (data) {
 };
 
 const getData = function (filter) {
-	return typeof filter === 'function' ? useragents.filter(filter) : useragents;
+	const agents = typeof filter === 'function' ? useragents.filter(filter) : useragents;
+	return agents.map(x => ({
+		folder: '',
+		description: '',
+		userAgent: '',
+		appCodename: '',
+		appName: '',
+		appVersion: '',
+		platform: '',
+		vendor: '',
+		vendorSub: '',
+		browserName: '',
+		browserMajor: '',
+		browserVersion: '',
+		deviceModel: '',
+		deviceType: '',
+		deviceVendor: '',
+		engineName: '',
+		engineVersion: '',
+		osName: '',
+		osVersion: '',
+		cpuArchitecture: '',
+		...x,
+	}))
 };
 
 exports.getRandom = function (filter) {

package.json

@@ -33,6 +33,7 @@
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
     "eslint": "^7.6.0",
+    "lodash": "^4.17.21",
     "mocha": "^8.1.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",

scripts/create-data.js

@@ -18,6 +18,7 @@ const fs = require('fs');
 const request = require('request');
 const xml2js = require('xml2js');
 const UAParser = require('ua-parser-js');
+const _ = require('lodash')
 
 // instance
 const useragents = [];
@@ -32,7 +33,7 @@ const parseUseragents = function (folderName, folderItem) {
 			uaParser.setUA(useragent.useragent);
 			const parsed = uaParser.getResult();
 			if (typeof useragent.useragent === 'string' && useragent.useragent.length > 0) {
-				useragents.push({
+				const ua = {
 					folder: folderName,
 					description: useragent.description,
 					userAgent: useragent.useragent,
@@ -53,7 +54,8 @@ const parseUseragents = function (folderName, folderItem) {
 					osName: parsed.os.name || '',
 					osVersion: parsed.os.version || '',
 					cpuArchitecture: parsed.cpu.architecture || ''
-				});
+				};
+				useragents.push(_.pickBy(ua, x => x !== ''));
 			}
 		});
 	}