faker 5.3.1 → 5.5.2

package/lib/system.js

@@ -1,26 +1,52 @@
 // generates fake data for many computer systems properties
 
+var commonFileTypes = [
+  "video",
+  "audio",
+  "image",
+  "text",
+  "application"
+];
+
+var commonMimeTypes = [
+  "application/pdf",
+  "audio/mpeg",
+  "audio/wav",
+  "image/png",
+  "image/jpeg",
+  "image/gif",
+  "video/mp4",
+  "video/mpeg",
+  "text/html"
+];
+
+function setToArray(set) {
+  // shortcut if Array.from is available
+  if (Array.from) { return Array.from(set); }
+
+  var array = [];
+  set.forEach(function (item) {
+    array.push(item);
+  });
+  return array;
+}
+
 /**
  *
  * @namespace faker.system
  */
-function System (faker) {
+function System(faker) {
 
   /**
-   * generates a file name with extension or optional type
+   * generates a file name
    *
    * @method faker.system.fileName
-   * @param {string} ext
-   * @param {string} type
    */
-  this.fileName = function (ext, type) {
-    var str = faker.fake("{{random.words}}.{{system.fileExt}}");
-    str = str.replace(/ /g, '_');
-    str = str.replace(/\,/g, '_');
-    str = str.replace(/\-/g, '_');
-    str = str.replace(/\\/g, '_');
-    str = str.replace(/\//g, '_');
-    str = str.toLowerCase();
+  this.fileName = function () {
+    var str = faker.random.words(); 
+    str = str
+          .toLowerCase()
+          .replace(/\W/g, "_") + "." + faker.system.fileExt();;
     return str;
   };
 
@@ -29,16 +55,13 @@ function System (faker) {
    *
    * @method faker.system.commonFileName
    * @param {string} ext
-   * @param {string} type
    */
-  this.commonFileName = function (ext, type) {
-    var str = faker.random.words() + "." + (ext || faker.system.commonFileExt());
-    str = str.replace(/ /g, '_');
-    str = str.replace(/\,/g, '_');
-    str = str.replace(/\-/g, '_');
-    str = str.replace(/\\/g, '_');
-    str = str.replace(/\//g, '_');
-    str = str.toLowerCase();
+  this.commonFileName = function (ext) {
+    var str = faker.random.words();
+    str = str
+          .toLowerCase()
+          .replace(/\W/g, "_");
+    str += "." + (ext || faker.system.commonFileExt());
     return str;
   };
 
@@ -48,7 +71,27 @@ function System (faker) {
    * @method faker.system.mimeType
    */
   this.mimeType = function () {
-    return faker.random.arrayElement(Object.keys(faker.definitions.system.mimeTypes));
+    var typeSet = new Set();
+    var extensionSet = new Set();
+    var mimeTypes = faker.definitions.system.mimeTypes;
+
+    Object.keys(mimeTypes).forEach(function (m) {
+      var type = m.split("/")[0];
+
+      typeSet.add(type);
+
+      if (mimeTypes[m].extensions instanceof Array) {
+        mimeTypes[m].extensions.forEach(function (ext) {
+          extensionSet.add(ext);
+        });
+      }
+    });
+
+    var types = setToArray(typeSet);
+    var extensions = setToArray(extensionSet);
+    var mimeTypeKeys = Object.keys(faker.definitions.system.mimeTypes);
+
+    return faker.random.arrayElement(mimeTypeKeys);
   };
 
   /**
@@ -57,29 +100,16 @@ function System (faker) {
    * @method faker.system.commonFileType
    */
   this.commonFileType = function () {
-    var types = ['video', 'audio', 'image', 'text', 'application'];
-    return faker.random.arrayElement(types)
+    return faker.random.arrayElement(commonFileTypes);
   };
 
   /**
-   * returns a commonly used file extension based on optional type
+   * returns a commonly used file extension
    *
    * @method faker.system.commonFileExt
-   * @param {string} type
    */
-  this.commonFileExt = function (type) {
-    var types = [
-      'application/pdf',
-      'audio/mpeg',
-      'audio/wav',
-      'image/png',
-      'image/jpeg',
-      'image/gif',
-      'video/mp4',
-      'video/mpeg',
-      'text/html'
-    ];
-    return faker.system.fileExt(faker.random.arrayElement(types));
+  this.commonFileExt = function () {
+    return faker.system.fileExt(faker.random.arrayElement(commonMimeTypes));
   };
 
 
@@ -89,15 +119,27 @@ function System (faker) {
    * @method faker.system.fileType
    */
   this.fileType = function () {
-    var types = [];
-    var mimes = faker.definitions.system.mimeTypes;
-    Object.keys(mimes).forEach(function(m){
-      var parts = m.split('/');
-      if (types.indexOf(parts[0]) === -1) {
-        types.push(parts[0]);
+    var typeSet = new Set();
+    var extensionSet = new Set();
+    var mimeTypes = faker.definitions.system.mimeTypes;
+
+    Object.keys(mimeTypes).forEach(function (m) {
+      var type = m.split("/")[0];
+
+      typeSet.add(type);
+
+      if (mimeTypes[m].extensions instanceof Array) {
+        mimeTypes[m].extensions.forEach(function (ext) {
+          extensionSet.add(ext);
+        });
       }
     });
+
+    var types = setToArray(typeSet);
+    var extensions = setToArray(extensionSet);
+    var mimeTypeKeys = Object.keys(faker.definitions.system.mimeTypes);
     return faker.random.arrayElement(types);
+
   };
 
   /**
@@ -107,23 +149,32 @@ function System (faker) {
    * @param {string} mimeType
    */
   this.fileExt = function (mimeType) {
-    var exts = [];
-    var mimes = faker.definitions.system.mimeTypes;
+    var typeSet = new Set();
+    var extensionSet = new Set();
+    var mimeTypes = faker.definitions.system.mimeTypes;
 
-    // get specific ext by mime-type
-    if (typeof mimes[mimeType] === "object") {
-      return faker.random.arrayElement(mimes[mimeType].extensions);
-    }
+    Object.keys(mimeTypes).forEach(function (m) {
+      var type = m.split("/")[0];
 
-    // reduce mime-types to those with file-extensions
-    Object.keys(mimes).forEach(function(m){
-      if (mimes[m].extensions instanceof Array) {
-        mimes[m].extensions.forEach(function(ext){
-          exts.push(ext)
+      typeSet.add(type);
+
+      if (mimeTypes[m].extensions instanceof Array) {
+        mimeTypes[m].extensions.forEach(function (ext) {
+          extensionSet.add(ext);
         });
       }
     });
-    return faker.random.arrayElement(exts);
+
+    var types = setToArray(typeSet);
+    var extensions = setToArray(extensionSet);
+    var mimeTypeKeys = Object.keys(faker.definitions.system.mimeTypes);
+
+    if (mimeType) {
+      var mimes = faker.definitions.system.mimeTypes;
+      return faker.random.arrayElement(mimes[mimeType].extensions);
+    }
+
+    return faker.random.arrayElement(extensions);
   };
 
   /**
@@ -132,8 +183,8 @@ function System (faker) {
    * @method faker.system.directoryPath
    */
   this.directoryPath = function () {
-      var paths = faker.definitions.system.directoryPaths
-      return faker.random.arrayElement(paths);
+    var paths = faker.definitions.system.directoryPaths
+    return faker.random.arrayElement(paths);
   };
 
   /**
@@ -142,7 +193,7 @@ function System (faker) {
    * @method faker.system.filePath
    */
   this.filePath = function () {
-      return faker.fake("{{system.directoryPath}}/{{system.fileName}}");
+    return faker.fake("{{system.directoryPath}}/{{system.fileName}}.{{system.fileExt}}");
   };
 
   /**
@@ -151,9 +202,9 @@ function System (faker) {
    * @method faker.system.semver
    */
   this.semver = function () {
-      return [faker.random.number(9),
-              faker.random.number(9),
-              faker.random.number(9)].join('.');
+    return [faker.datatype.number(9),
+      faker.datatype.number(9),
+      faker.datatype.number(9)].join('.');
   }
 
 }

package/lib/time.js

@@ -13,7 +13,7 @@ var _Time = function(faker) {
    */
   self.recent = function(outputType) {
     if (typeof outputType === "undefined") {
-        outputType = 'unix';
+      outputType = 'unix';
     }
 
     var date = new Date();

package/lib/vehicle.js

@@ -83,11 +83,12 @@ var Vehicle = function (faker) {
    * @method faker.vehicle.vin
    */
   self.vin = function () {
+    var bannedChars=['o','i','q'];
     return (
-      faker.random.alphaNumeric(10) +
-      faker.random.alpha({ count: 1, upcase: true }) +
-      faker.random.alphaNumeric(1) +
-      faker.random.number({ min: 10000, max: 100000}) // return five digit #
+      faker.random.alphaNumeric(10, {bannedChars:bannedChars}) +
+      faker.random.alpha({ count: 1, upcase: true ,bannedChars:bannedChars}) +
+      faker.random.alphaNumeric(1, {bannedChars:bannedChars}) +
+      faker.datatype.number({ min: 10000, max: 100000}) // return five digit #
     ).toUpperCase();
   };
 
@@ -109,6 +110,39 @@ var Vehicle = function (faker) {
     "description": "Generates a color",
     "sampleResults": ["red", "white", "black"]
   };
+
+  /**
+     * vrm
+     *
+     * @method faker.vehicle.vrm
+     */
+  self.vrm = function () {
+    return (
+      faker.random.alpha({ count: 2, upcase: true }) +
+            faker.datatype.number({ min: 0, max: 9 }) +
+            faker.datatype.number({ min: 0, max: 9 }) +
+            faker.random.alpha({ count: 3, upcase: true })
+    ).toUpperCase();
+  };
+
+  self.vrm.schema = {
+    "description": "Generates a vehicle vrm",
+    "sampleResults": ["MF56UPA", "GL19AAQ", "SF20TTA"]
+  };
+
+  /**
+  * bicycle
+  *
+  * @method faker.vehicle.bicycle
+  */
+  self.bicycle = function () {
+    return faker.random.arrayElement(faker.definitions.vehicle.bicycle_type);
+  };
+
+  self.bicycle.schema = {
+    "description": "Generates a type of bicycle",
+    "sampleResults": ["Adventure Road Bicycle", "City Bicycle", "Recumbent Bicycle"]
+  };
 };
 
 module["exports"] = Vehicle;

package/locale/ReadMe.md

@@ -2,7 +2,7 @@
 
 The files in this directory have been auto-generated from the `gulpfile`.
 
-These file exist in order to allow users to require the `faker` library using a specific locale ( instead of the default behavior or loading all all locales ).
+These file exist in order to allow users to require the `faker` library using a specific locale ( instead of the default behavior or loading all locales ).
 
 Example:
 

package/locale/en.js

@@ -1,5 +1,5 @@
 var Faker = require('../lib');
 var faker = new Faker({ locale: 'en', localeFallback: 'en' });
 faker.locales['en'] = require('../lib/locales/en');
-faker.locales['en'] = require('../lib/locales/en');
+
 module['exports'] = faker;

package/locale/en_GH.js

@@ -0,0 +1,5 @@
+var Faker = require('../lib');
+var faker = new Faker({ locale: 'en_GH', localeFallback: 'en' });
+faker.locales['en_GH'] = require('../lib/locales/en_GH');
+faker.locales['en'] = require('../lib/locales/en');
+module['exports'] = faker;

package/locale/hy.js

@@ -0,0 +1,5 @@
+var Faker = require('../lib');
+var faker = new Faker({ locale: 'hy', localeFallback: 'en' });
+faker.locales['hy'] = require('../lib/locales/hy');
+faker.locales['en'] = require('../lib/locales/en');
+module['exports'] = faker;

package/locale/ne.js

@@ -0,0 +1,5 @@
+var Faker = require('../lib');
+var faker = new Faker({ locale: 'ne', localeFallback: 'en' });
+faker.locales['ne'] = require('../lib/locales/ne');
+faker.locales['en'] = require('../lib/locales/en');
+module['exports'] = faker;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "faker",
   "description": "Generate massive amounts of fake contextual data",
-  "version": "5.3.1",
+  "version": "5.5.2",
   "contributors": [
     "Marak Squires <marak.squires@gmail.com>"
   ],
@@ -13,7 +13,7 @@
     "browser": "./node_modules/.bin/gulp browser",
     "jsdoc": "./node_modules/.bin/gulp jsdoc",
     "readme": "./node_modules/.bin/gulp readme",
-    "lint": "node_modules/.bin/jshint ./lib --config ./.jshintrc",
+    "lint": "node_modules/.bin/eslint ./lib/animal.js",
     "test": "node_modules/.bin/mocha test/*.*.js",
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
@@ -51,9 +51,10 @@
     "gulp-mustache": "^5.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-uglify": "^3.0.2",
+    "eslint": "^6.5.1",
     "ink-docstrap": "1.1.4",
     "jsdoc": "^3.4.0",
-    "jshint": "0.9.0",
+    "lint-staged": "^9.4.2",
     "lodash": "^4.6.1",
     "mocha": "^8.1.1",
     "node-minify": "*",