[ Add ] Nested OnionStack support

[ Add ]  Example code

Author: TechQuery

ReadMe.md

@@ -1,29 +1,51 @@
-# MiddleStack
+# OnionStack
 
 **Middleware** framework based on [Async Generator][1] of ECMAScript 2018, inspired by [Koa 2][2].
 
-[![NPM Dependency](https://david-dm.org/TechQuery/middle-stack.svg)](https://david-dm.org/TechQuery/middle-stack)
-[![Build Status](https://travis-ci.com/TechQuery/middle-stack.svg?branch=master)](https://travis-ci.com/TechQuery/middle-stack)
-[![](https://data.jsdelivr.com/v1/package/npm/middle-stack/badge?style=rounded)](https://www.jsdelivr.com/package/npm/middle-stack)
+[![NPM Dependency](https://david-dm.org/TechQuery/onion-stack.svg)](https://david-dm.org/TechQuery/onion-stack)
+[![Build Status](https://travis-ci.com/TechQuery/onion-stack.svg?branch=master)](https://travis-ci.com/TechQuery/onion-stack)
+[![](https://data.jsdelivr.com/v1/package/npm/onion-stack/badge?style=rounded)](https://www.jsdelivr.com/package/npm/onion-stack)
 
-[![NPM](https://nodei.co/npm/middle-stack.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/middle-stack/)
+[![NPM](https://nodei.co/npm/onion-stack.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/onion-stack/)
 
-## Usage
+## Example
 
-[**Typical cases**](https://tech-query.me/test-file/test/index.js.html)
+```JavaScript
+import OnionStack from 'onion-stack';
 
-`.babelrc`
 
-```JSON
-{
-    "presets": [
-        "@babel/preset-env"
-    ],
-    "plugins": [
-        "@babel/plugin-proposal-async-generator-functions"
-    ]
-}
+const list = [ ];
+
+const stack = new OnionStack(
+    function*() {
+        list.push(1);
+
+        yield;
+
+        list.push(2);
+
+        yield;
+
+        list.push(3);
+    },
+    async function*() {
+        await delay(0.1);
+
+        list.push(4);
+
+        yield;
+
+        list.push(5);
+    },
+    function() {
+        list.push(6);
+    }
+);
+
+stack.execute().then(() => console.log( list ));    //  [1, 4, 6, 5, 2]
 ```
 
+[More cases](https://tech-query.me/onion-stack/test.html)
+
 [1]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for-await...of#Iterating_over_async_generators
 [2]: https://koajs.com

package-lock.json

@@ -1,6 +1,6 @@
 {
-    "name": "middle-stack",
-    "version": "0.1.0",
+    "name": "onion-stack",
+    "version": "0.2.0",
     "description": "Middleware framework based on Async Generator of ECMAScript 2018, inspired by Koa 2",
     "keywords": [
         "middleware",
@@ -9,18 +9,18 @@
         "ecmascript",
         "koa"
     ],
-    "license": "ISC",
+    "license": "LGPL-3.0",
     "author": "[email protected]",
-    "homepage": "https://tech-query.me/middle-stack/",
+    "homepage": "https://tech-query.me/onion-stack/",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/TechQuery/middle-stack.git"
+        "url": "git+https://github.com/TechQuery/onion-stack.git"
     },
     "bugs": {
-        "url": "https://github.com/TechQuery/middle-stack/issues"
+        "url": "https://github.com/TechQuery/onion-stack/issues"
     },
     "module": "source/index.js",
-    "main": "dist/index.js",
+    "main": "dist/index.min.js",
     "directories": {
         "test": "test"
     },
@@ -43,7 +43,6 @@
         "@babel/polyfill": "^7.2.5"
     },
     "devDependencies": {
-        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
         "@babel/polyfill": "^7.2.5",
         "@babel/preset-env": "^7.3.4",
         "@babel/register": "^7.0.0",
@@ -61,9 +60,6 @@
     "babel": {
         "presets": [
             "@babel/preset-env"
-        ],
-        "plugins": [
-            "@babel/plugin-proposal-async-generator-functions"
         ]
     },
     "prettier": {

package.json

@@ -1,4 +1,4 @@
-export default class MiddleStack extends Array {
+export default class OnionStack extends Array {
     /**
      * @param  {...Function} middleware
      */
@@ -7,32 +7,42 @@ export default class MiddleStack extends Array {
     }
 
     /**
-     * @param {...*} parameter
+     * @protected
+     *
+     * @param {Function} func
+     * @param {?Array}   parameter
      */
-    async execute(...parameter) {
-        const func = this[++this.last];
+    async exec(func, parameter) {
+        const iterator = func.apply(null, parameter);
 
-        if (func)
-            try {
-                const iterator = func.apply(null, parameter);
+        if (!((iterator || '').next instanceof Function)) return;
 
-                if ((iterator || '').next instanceof Function) {
-                    await iterator.next();
+        await iterator.next();
 
-                    await this.execute.apply(this, parameter);
+        await this.execute.apply(this, parameter);
 
-                    const { done } = await iterator.next();
+        const { done } = await iterator.next();
 
-                    if (!done)
-                        console.warn(
-                            'Only one `yield` is made sense in a Middleware'
-                        );
-                }
-            } catch (error) {
-                this.last--;
+        if (!done)
+            console.warn('Only one `yield` is made sense in a Middleware');
+    }
 
-                throw error;
-            }
+    /**
+     * @param {...*} parameter
+     */
+    async execute(...parameter) {
+        const middleware = this[++this.last];
+
+        try {
+            if (middleware instanceof OnionStack)
+                await middleware.execute.apply(middleware, parameter);
+            else if (middleware instanceof Function)
+                await this.exec(middleware, parameter);
+        } catch (error) {
+            this.last--;
+
+            throw error;
+        }
 
         this.last--;
     }

source/index.js

@@ -1,4 +1,4 @@
-import MiddleStack from '../source';
+import OnionStack from '../source';
 
 function delay(seconds) {
     return new Promise(resolve => setTimeout(resolve, seconds * 1000));
@@ -32,14 +32,14 @@ var list = [],
     ];
 
 /**
- * @test {MiddleStack}
+ * @test {OnionStack}
  */
-describe('Call stack', () => {
+describe('Middleware callstack', () => {
     /**
-     * @test {MiddleStack#execute}
+     * @test {OnionStack#execute}
      */
     it('Execute normally', async () => {
-        stack = MiddleStack.from(stack);
+        stack = OnionStack.from(stack);
 
         await stack.execute();
 
@@ -49,11 +49,13 @@ describe('Call stack', () => {
     });
 
     /**
-     * @test {MiddleStack#execute}
+     * @test {OnionStack#exec}
      */
     it('Execute abnormally', async () => {
         list.length = 0;
 
+        const right = stack[1];
+
         stack[1] = async function*() {
             await delay(0.1);
 
@@ -69,5 +71,20 @@ describe('Call stack', () => {
         list.should.be.eql([1, 4, 6]);
 
         stack.last.should.be.equal(-1);
+
+        stack[1] = right;
+    });
+
+    /**
+     * @test {OnionStack#execute}
+     */
+    it('Nested stack', async () => {
+        list.length = 0;
+
+        stack.splice(2, 0, OnionStack.from(stack));
+
+        await stack.execute();
+
+        list.should.be.eql([1, 4, 1, 4, 6, 5, 2, 5, 2]);
     });
 });