release: 0.2.8

* chore: add contrubute guide

* chore: add 'dev' script

* feat: change image service source

* feat: optimize Random.pick function

* doc: translate CONTRUBUTING.md

* feat: support random.extend

* feat: Random.emoji

* test: Random.emoji unit test

* docs: Random.emoji

* chore: ignore some unit test

* release: 0.2.8

Co-authored-by: mocobk <[email protected]>

Author: lavyun

Diff for: .github/CONTRIBUTING.md

@@ -1,37 +1,21 @@
-# Contributing to Better-Mock
-
-The following is a set of guidelines for contributing to `better-mock`. Please spend several minutes in reading these guidelines before you create an issue or pull request.
-
-Anyway, these are just guidelines, not rules, use your best judgment and feel free to propose changes to this document in a pull request.
-
-## Opening an Issue
-
-If you think you have found a bug, or have a new feature idea, please start by making sure it hasn't already been reported or fixed. You can search through existing issues and PRs to see if someone has reported one similar to yours.
-
-Next, create a new issue that briefly explains the problem, and provides a bit of background as to the circumstances that triggered it, and steps to reproduce it.
-
 ## Submitting a Pull Request
 
-It's welcomed to pull request, And there are some tips about that:
-
-- Before working on a large change, it is best to open an issue first to discuss it with the maintainers.
-
-- When in doubt, keep your pull requests small. To give a PR the best chance of getting accepted, don't bundle more than one feature or bug fix per pull request. It's always best to create two smaller PRs than one big one.
+非常感谢您为 `better-mock` 做出贡献，在提交 pull request 前请花几分钟时间阅读一下这篇指南：
 
-- When adding new features or modifying existing, please attempt to include tests to confirm the new behaviour.
+- 在进行巨大更改之前，先开一个 issue，与维护人员讨论。
 
-- Rebase before creating a PR to keep commit history clear.
+- 请保持你的 pr 尽可能的小，不要将多个特性或者多个 bug 修复写到一个 pr 里。
 
-- Add some descriptions and refer relative issues for you PR.
+- 尽可能多的为你的 pr 填写描述信息。
 
 ## Getting started
 
-1. Fork `better-mock`, then clone the repository to your local.
+1. Fork `better-mock`, 然后克隆仓库到本地。
 
-2. Install dependencies.
+2. 基于 `develop` 分支拉取新的分支，在做完更改之后，可以执行 `npm run dev` 进行调试。
 
-3. Execute `npm run build` after you make changes.
+3. 请确保你的更改都通过了 `test/browser/*.js` 下的单元测试。
 
-4. Please complete the unit test to ensure that your changes are covered.
+4. 提交代码，注意不要将 `dist` 目录下的更改提交上去。
 
-5. Submit a Pull-Request to `better-mock`.
+4. 提交 pr 到 `better-mock` 的 `develop` 分支。

Diff for: dist/mock.browser.esm.js

@@ -29,7 +29,8 @@ module.exports = {
             ['/document/random/web', 'web'],
             ['/document/random/address', 'address'],
             ['/document/random/helper', 'helper'],
-            ['/document/random/miscellaneous', 'miscellaneous']
+            ['/document/random/miscellaneous', 'miscellaneous'],
+            ['/document/random/extend', '自定义扩展']
           ]
         },
         ['/document/valid/', 'Mock.valid()'],
@@ -48,4 +49,4 @@ module.exports = {
       }))
     }
   }
-}
+}

Diff for: dist/mock.browser.js

@@ -0,0 +1,23 @@
+## Random.extend
+
+* Random.extend( source )
+
+Mock.Random 中的方法与数据模板的 `@占位符` 一一对应，在需要时还可以为 Mock.Random 扩展方法，然后在数据模板中通过 `@扩展方法` 引用。例如：
+
+
+```js
+Random.extend({
+  constellation: function(date) {
+    const constellations = ['白羊座', '金牛座', '双子座', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座', '水瓶座', '双鱼座']
+    return this.pick(constellations)
+  }
+})
+Random.constellation()
+// => "水瓶座"
+Mock.mock('@CONSTELLATION')
+// => "天蝎座"
+Mock.mock({
+  constellation: '@CONSTELLATION'
+})
+// => { constellation: "射手座" }
+```

Diff for: dist/mock.browser.min.js

@@ -67,7 +67,7 @@ Random.shuffle(['a', 'e', 'i', 'o', 'u'])
 // => ["o", "u", "e", "i", "a"]
 
 Random.shuffle(['a', 'e', 'i', 'o', 'u'], 3)
-// => ["o", "u", "i"
+// => ["o", "u", "i"]
 
 Random.shuffle(['a', 'e', 'i', 'o', 'u'], 2, 4)
 // => ["o", "u"]

Diff for: dist/mock.mp.esm.js

@@ -2,7 +2,7 @@
 
 * Random.image()
 * Random.image( size )
-* Random.image( size, background )
+* Random.image( size, text )
 * Random.image( size, background, text )
 * Random.image( size, background, foreground, text )
 * Random.image( size, background, foreground, format, text )
@@ -27,33 +27,33 @@
 
 ### background <Badge text="可选"/>
 
-指示图片的背景色。默认值为 `'#000000'`。
+指示图片的背景色。。
 
 ### foreground <Badge text="可选"/>
 
-指示图片的前景色（文字）。默认值为 `'#FFFFFF'`。
+指示图片的前景色（文字）。。
 
 ### format <Badge text="可选"/>
 
-指示图片的格式。默认值为 `'png'`，可选值包括：`'png'`、`'gif'`、`'jpg'`。
+指示图片的格式。可选值包括：`'png'`、`'gif'`、`'jpg'`。
 
 ### text <Badge text="可选"/>
 
 指示图片上的文字。默认值为参数 size。
 
 ```js
 Random.image()
-// => "http://dummyimage.com/125x125"
-Random.image('200x100')
-// => "http://dummyimage.com/200x100"
-Random.image('200x100', '#fb0a2a')
-// => "http://dummyimage.com/200x100/fb0a2a"
-Random.image('200x100', '#02adea', 'Hello')
-// => "http://dummyimage.com/200x100/02adea&text=Hello"
-Random.image('200x100', '#00405d', '#FFF', 'Mock')
-// => "http://dummyimage.com/200x100/00405d/FFF&text=Mock"
-Random.image('200x100', '#ffcc33', '#FFF', 'png', '!')
-// => "http://dummyimage.com/200x100/ffcc33/FFF.png&text=!"
+// => "https://iph.href.lu/450x600?bg=&fg=&text="
+Random.image('300x400')
+// => "https://iph.href.lu/300x400?bg=&fg=&text="
+Random.image('300x400', 'HelloWorld')
+// => "https://iph.href.lu/300x400?bg=&fg=&text=HelloWorld"
+Random.image('300x400', '#234567', 'HelloWorld')
+// => "https://iph.href.lu/300x400?bg=234567&fg=&text=HelloWorld"
+Random.image('300x400', '#234567', '#FFFFFF', 'HelloWorld')
+// => "https://iph.href.lu/300x400?bg=234567&fg=FFFFFF&text=HelloWorld"
+Random.image('300x400', '#234567', '#FFFFFF', 'png', 'HelloWorld')
+// => "http://dummyimage.com/300x400/234567/FFFFFF.png&text=HelloWorld"
 ```
 
 ## Random.dataImage

Diff for: dist/mock.mp.js

@@ -168,6 +168,44 @@ Random.cword('零一二三四五六七八九十', 5, 7)
 // => "九七七零四"
 ```
 
+## Random.emoji
+
+* Random.emoji()
+* Random.emoji( pool )
+* Random.emoji( length )
+* Random.emoji( pool, length )
+* Random.emoji( min, max )
+* Random.emoji( pool, min, max )
+
+随机生成一个或多个 emoji 表情字符。
+
+### pool <Badge text="可选"/>
+
+可以是任意字符串，如常用字符、特使字符、emoji等，将从中选择一个或多个字符返回。
+
+### min <Badge text="可选"/>
+
+随机 emoji 字符串的最小长度。默认值为 1。
+
+### max <Badge text="可选"/>
+
+随机 emoji 字符串的最大长度。默认值为 1。
+
+```js
+Random.emoji()
+// => "😷"
+Random.emoji('😀😁😂😃😄')
+// => "😁"
+Random.emoji(3)
+// => "😂😃😄"
+Random.emoji('😀😁😂😃😄', 2)
+// => ""😃😀""
+Random.emoji(3, 6)
+// => "🐥🐄🍪🌘😷🙊"
+Random.emoji('123🌘😷🙊★♠♫', 3, 6)
+// => "★2🌘😷"
+```
+
 ## Random.title
 
 * Random.title()

Diff for: dist/mock.node.js

@@ -2,7 +2,7 @@
   "name": "better-mock",
   "description": "Forked from Mockjs. Generate random data & Intercept ajax request. Support miniprogram.",
   "author": "[email protected]",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "main": "./dist/mock.node.js",
   "module": "./dist/mock.browser.esm.js",
   "browser": "./dist/mock.browser.js",

Diff for: doc/.vuepress/config.js

@@ -86,8 +86,7 @@ const handler = {
     }
     return handler[node.type] ? handler[node.type](node, result, cache) : handler.token(node)
   },
-  
-  token: function (node) {
+  token: /* istanbul ignore next */ function (node) {
     switch (node.type) {
       case 'start':
       case 'end':

Diff for: doc/document/random/README.md

@@ -61,6 +61,7 @@ function ControlCharacter (n) {
   Token.call(this, 'control-character'), this.code = n.toUpperCase()
 }
 
+/* istanbul ignore next */
 var parser = function () {
   function n (n, l) {
     function u () {
@@ -516,7 +517,6 @@ var parser = function () {
           null !== t ? (Lt = l, u = bu(t), null === u ? (qt = l, l = u) : l = u) : (qt = l,
             l = il)) : (qt = l, l = il), l
     }
-
     var rl, el = arguments.length > 1 ? arguments[1] : {}, ol = {
         regexp: c
       }, cl = c, il = null, al = '', fl = '|', sl = '"|"', hl = function (n, l) {

Diff for: doc/document/random/extend.md

@@ -39,7 +39,7 @@ if (window.Proxy) {
       return extendRequest(request, input, init)
     }
   })
-} else {
+} /* istanbul ignore next */ else {
   MockRequest = function MockRequest (input: RequestInfo, init?: RequestInit | undefined): Request {
     const request = new _nativeRequest(input, init)
     return extendRequest(request, input, init)

Diff for: doc/document/random/helper.md

@@ -35,6 +35,7 @@ export const county = function (prefix: boolean = false): string {
   const specialCity = ['460400', '441900', '442000', '620200']
   const province = helper.pickMap(areas)
   const city = helper.pickMap(province.cities)
+  /* istanbul ignore next */
   if (specialCity.indexOf(city.code) !== -1) {
     return county(prefix)
   }