fix model extend bug

Author: jzzj

.gitignore

@@ -2,3 +2,4 @@
 node_modules/
 .DS_Store
 npm-*.log
+test/thrift

lib/generate-data.js

@@ -17,7 +17,6 @@ var UNMATCHED = {};
 var mockData = {};
 var generateBoundary = false;
 function generate(type, ast, opts) {
-  //console.log(type, JSON.stringify(ast, void 0 ,4), 'original-ast');
   var ret = type.split(".");
   if (ret.length > 1) {
     ast = ast.include[ret[0]];
@@ -57,6 +56,7 @@ function constructorData(structItems, ast) {
         } else {
           items = innerAst.struct[item.type];
         }
+        extendModels(innerAst, ast);
         ret[item.name] = constructorData(items, innerAst);
       } else {
         ret[item.name] = result;
@@ -71,10 +71,10 @@ function constructorData(structItems, ast) {
           if (generateResult === UNMATCHED) {
             var data = getStruct(valueType, ast);
             var _items = data.struct;
-            //console.log("---list", valueType, "||", ast, "list---");
-            ast = data.ast;
+            var _innerAst = data.ast;
+            extendModels(_innerAst, ast);
             for (var i = 0, len = Math.round(Math.random() * 20); i < len; i++) {
-              _result2.push(constructorData(_items, ast));
+              _result2.push(constructorData(_items, _innerAst));
             }
             ret[item.name] = _result2;
           } else {
@@ -107,6 +107,17 @@ function getStruct(type, ast) {
   }
 }
 
+function extendModels(innerAst, outerAst) {
+  if (innerAst && outerAst && outerAst.include) {
+    innerAst.include = innerAst.include || {};
+    for (var model in outerAst.include) {
+      if (!innerAst.include[model]) {
+        innerAst.include[model] = outerAst.include[model];
+      }
+    }
+  }
+}
+
 function findModel(model, ast) {
   if (ast.include) {
     if (ast && ast.include && ast.include[model]) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "thrift-mocker",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Easy to mock data based on thrift, no hard code data anymore!",
   "author": {
     "name": "zangzhan"

src/generate-data.js

@@ -5,7 +5,6 @@ const UNMATCHED = {};
 var mockData = {};
 var generateBoundary = false;
 export default function generate(type, ast, opts){
-  //console.log(type, JSON.stringify(ast, void 0 ,4), 'original-ast');
   var ret = type.split(".");
   if(ret.length > 1){
     ast = ast.include[ret[0]];
@@ -45,6 +44,7 @@ function constructorData(structItems, ast){
         }else{
           items = innerAst.struct[item.type];
         }
+        extendModels(innerAst, ast);
         ret[item.name] = constructorData(items, innerAst);
       }else{
         ret[item.name] = result;
@@ -59,10 +59,10 @@ function constructorData(structItems, ast){
           if(generateResult === UNMATCHED){
             const data = getStruct(valueType, ast);
             const items = data.struct;
-            //console.log("---list", valueType, "||", ast, "list---");
-            ast = data.ast;
+            let innerAst = data.ast;
+            extendModels(innerAst, ast);
             for(let i=0, len=Math.round(Math.random()*20); i<len; i++){
-              result.push(constructorData(items, ast));
+              result.push(constructorData(items, innerAst));
             }
             ret[item.name] = result;
           }else{
@@ -95,6 +95,17 @@ function getStruct(type, ast){
   }
 }
 
+function extendModels(innerAst, outerAst){
+  if(innerAst && outerAst && outerAst.include) {
+    innerAst.include = innerAst.include || {};
+    for(var model in outerAst.include) {
+      if(!innerAst.include[model]){
+        innerAst.include[model] = outerAst.include[model];
+      }
+    }
+  }
+}
+
 function findModel(model, ast){
   if(ast.include){
     if(ast && ast.include &&ast.include[model]){