修订一处配置和sample脚本

owent · Mar 29, 2018 · d9736f6 · d9736f6
1 parent b7c2f78
commit d9736f6
Show file tree

Hide file tree

Showing 39 changed files with 554 additions and 563 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,11 @@
 更新记录：
 ==========
+1.4.3
+------
+1. javascript全局导出支持多层namespace
+2. 修订sample脚本问题导致的node.js转出选项不正确的问题
+
+
 1.4.2
 ------
 1. 增加一些错误提示信息的行提示和表名提示，用以辅助排查配置错误

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.owent.xresloader</groupId>
     <artifactId>xresloader</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
     <packaging>jar</packaging>
     <name>xresloader</name>
 

diff --git a/sample/arr_in_arr_cfg.json b/sample/arr_in_arr_cfg.json
@@ -0,0 +1 @@
+[{"count":2,"xres_ver":"1.4.2","hash_code":"no hash code","data_ver":"1.0.0.0"},{"arr_in_arr_cfg":[{"arr":[{"name":"第一个-A","str_arr":["啦啦啦啦","嘞嘞嘞嘞"],"int_arr":[101,102]},{"name":"第一个-B","str_arr":["嘟嘟嘟嘟","嚓嚓嚓嚓"],"int_arr":[111,112]}],"id":10001},{"arr":[{"name":"测试项-A","str_arr":["biubiubiubiu","唰唰唰唰"],"int_arr":[201,202]},{"name":"测试项-B","str_arr":["哦哦哦哦","哈哈哈哈"],"int_arr":[211,212]}],"id":10002}]}]
diff --git a/sample/gen_sample_output.ps1 b/sample/gen_sample_output.ps1
@@ -24,7 +24,7 @@ foreach ($proto_dir in "proto_v2", "proto_v3") {
     Write-Output '-t json -p protobuf -o '$proto_dir'    -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.json/"
         -t xml -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.xml/"
         -t msgpack -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.msgpack.bin/"
-        -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.js/" --javascript-global sample 
+        -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.js/" --javascript-global sample.xresloader
         -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|kind|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_cfg -m OutputFile=role_cfg.n.js -m KeyRow=2 -m KeyCase=lower -m KeyWordSplit=_ -m "KeyWordRegex=[A-Z_\$ \t\r\n]|[_\$ \t\r\n]|[a-zA-Z_\$]" --javascript-export nodejs 
         -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.amd\.js/" --javascript-export amd 
         -t lua -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2 -o proto_v3

diff --git a/sample/gen_sample_output.sh b/sample/gen_sample_output.sh
@@ -24,11 +24,11 @@ for proto_dir in proto_v2 proto_v3; do
         -t json -p protobuf -o '$proto_dir'    -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.json/"
         -t xml -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.xml/"
         -t msgpack -p protobuf -o '$proto_dir' -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.msgpack.bin/"
-        -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.js/" --javascript-global sample 
-        -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|kind|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_cfg -m OutputFile=role_cfg.n.js -m KeyRow=2 -m KeyCase=lower -m KeyWordSplit=_ -m "KeyWordRegex=[A-Z_\$ \t\r\n]|[_\$ \t\r\n]|[a-zA-Z_\$]" --javascript-export nodejs 
+        -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.js/" --javascript-global sample.xresloader 
+        -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|kind|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=role_cfg -m OutputFile=role_cfg.n.js -m KeyRow=2 -m KeyCase=lower -m KeyWordSplit=_ -m "KeyWordRegex=[A-Z_\$ \t]|[_\$ \t]|[a-zA-Z_\$]" --javascript-export nodejs 
         -t js -p protobuf -o '$proto_dir'      -f '$proto_dir/kind.pb' --pretty 2 -s '$XLSX_FILE' -m scheme_kind -n "/(?i)\.bin$/\.amd\.js/" --javascript-export amd 
-        -t lua -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2 -o proto_v3
-        -t bin -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2 -o proto_v3
+        -t lua -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' --pretty 2 -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.lua -m KeyRow=2 -o '$proto_dir'
+        -t bin -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' -m DataSource='$XLSX_FILE'|arr_in_arr|3,1 -m MacroSource='$XLSX_FILE'|macro|2,1 -m ProtoName=arr_in_arr_cfg -m OutputFile=arr_in_arr_cfg.bin -m KeyRow=2 -o '$proto_dir'
         -t json -p protobuf -o '$proto_dir'    -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_upgrade -n "/(?i)\.bin$/\.json/"
         -t lua -p protobuf -o '$proto_dir'     -f '$proto_dir/kind.pb' -s '$XLSX_FILE' -m scheme_upgrade -n "/(?i)\.bin$/\.lua/"
     ' | java -client -jar "$XRESLOADER" --stdin;

diff --git a/sample/proto_v2/arr_in_arr_cfg.bin b/sample/proto_v2/arr_in_arr_cfg.bin
@@ -1,6 +1,6 @@
 
 E
-1.4.21.4.2.20180317091854"$md5:eeb7df307a71ef69769793331a182435a�N-
+1.4.31.4.3.20180329102023"$md5:eeb7df307a71ef69769793331a182435a�N-
 第一个-Aef啦啦啦啦嘞嘞嘞嘞-
 第一个-Bop嘟嘟嘟嘟嚓嚓嚓嚓e�N/
 测试项-A��biubiubiubiu唰唰唰唰/

diff --git a/sample/proto_v2/arr_in_arr_cfg.lua b/sample/proto_v2/arr_in_arr_cfg.lua
@@ -2,9 +2,9 @@
 
 return {
   [1] = {
-    xres_ver = "1.4.2",
+    xres_ver = "1.4.3",
     hash_code = "no hash code",
-    data_ver = "1.4.2.20180317091854",
+    data_ver = "1.4.3.20180329102023",
     count = 2,
   },
   arr_in_arr_cfg = {

diff --git a/sample/proto_v2/kind_const.lua b/sample/proto_v2/kind_const.lua
@@ -20,4 +20,5 @@ local const_res = {
   },
 }
 
+
 return const_res
diff --git a/sample/proto_v2/kind_const_module.lua b/sample/proto_v2/kind_const_module.lua
@@ -21,5 +21,6 @@ local const_res = {
   },
 }
 
+
 game_const_config = const_res.game_const_config
 cost_type = const_res.cost_type
diff --git a/sample/proto_v2/role_cfg.amd.js b/sample/proto_v2/role_cfg.amd.js
@@ -2,9 +2,9 @@
 
 define({
   role_cfg_header: {
-    xres_ver : "1.4.2",
+    xres_ver : "1.4.3",
     hash_code : "no hash code",
-    data_ver : "1.4.2.20180317091854",
+    data_ver : "1.4.3.20180329102023",
     count : 7
   },
   role_cfg: [

diff --git a/sample/proto_v2/role_cfg.bin b/sample/proto_v2/role_cfg.bin
@@ -1,6 +1,6 @@
 
 8
-1.4.21.0.0.0"$md5:70c7e9d6bfe4d32d935311e7f7766d46H�N *	欧若拉R3123.0e
+1.4.31.0.0.0"$md5:70c7e9d6bfe4d32d935311e7f7766d46H�N *	欧若拉R3123.0e
 2014-10-13ZlalalZ	欧若拉Z	小魔女L�N' *杰克R=654.0�
 2014-10-14Z	bleblebleZ杰克Z海盗王子H�NU *库拉RGsdadasd�
 2014-10-15ZhahahaZ库拉Z	喵少年=�Nz *	莫瑞茨RQffff�19:10:50ZangelZ	莫瑞茨C�N��N ��*	爱丽丝R[gggg�09:10:50ZlaopoZ	爱丽丝S�N��N �*都玛西亚R#ehhhhh�2014-50-20 07:50:50ZkeaiZ都玛西亚

diff --git a/sample/proto_v2/role_cfg.js b/sample/proto_v2/role_cfg.js
@@ -1,12 +1,6 @@
 // this file is generated by xresloader, please don't edit it.
 
 (function(){
-  var role_cfg_header = {
-    xres_ver : "1.4.2",
-    hash_code : "no hash code",
-    data_ver : "1.4.2.20180317091854",
-    count : 7
-  };
   var extend = function (dst, src) {
     for (var k in src) {
       var v = src[k];
@@ -20,137 +14,133 @@
       }
     }
   };
-  try { extend(window, { "sample" : { role_cfg_header : role_cfg_header } }); }
-  catch(e) { extend(global, { "sample" : { role_cfg_header : role_cfg_header } }); }
-})();
-(function(){
-  var role_cfg = [
-    {
-      test_array : [
-        "lalal",
-        "欧若拉",
-        "小魔女"
-      ],
-      name : "欧若拉",
-      dep_test : {
-        name : "123.0",
-        id : 51,
-        dep2 : {
-          level : "2014-10-13",
-          id : 101
-        }
-      },
-      cost_value : 1,
-      id : 10001
-    },
-    {
-      unlock_level : 39,
-      test_array : [
-        "blebleble",
-        "杰克",
-        "海盗王子"
-      ],
-      name : "杰克",
-      dep_test : {
-        name : "654.0",
-        id : 61,
-        dep2 : {
-          level : "2014-10-14",
-          id : 201
-        }
-      },
-      cost_value : 2,
-      id : 10002
-    },
-    {
-      unlock_level : 85,
-      test_array : [
-        "hahaha",
-        "库拉",
-        "喵少年"
-      ],
-      name : "库拉",
-      dep_test : {
-        name : "sdadasd",
-        id : 71,
-        dep2 : {
-          level : "2014-10-15",
-          id : 301
-        }
-      },
-      cost_value : 4,
-      id : 10003
-    },
-    {
-      unlock_level : 122,
-      test_array : [
-        "angel",
-        "莫瑞茨"
-      ],
-      name : "莫瑞茨",
-      dep_test : {
-        name : "ffff",
-        id : 81,
-        dep2 : {
-          level : "19:10:50",
-          id : 401
-        }
-      },
-      cost_value : 8,
-      id : 10004
-    },
-    {
-      unlock_level : 183,
-      cost_type : 10001,
-      test_array : [
-        "laopo",
-        "爱丽丝"
-      ],
-      name : "爱丽丝",
-      dep_test : {
-        name : "gggg",
-        id : 91,
-        dep2 : {
-          level : "09:10:50",
-          id : 501
-        }
-      },
-      cost_value : 99999,
-      id : 10005
-    },
-    {
-      unlock_level : 274,
-      cost_type : 10101,
-      test_array : [
-        "keai",
-        "都玛西亚"
-      ],
-      name : "都玛西亚",
-      dep_test : {
-        name : "hhhhh",
-        id : 101,
-        dep2 : {
-          level : "2014-50-20 07:50:50",
-          id : 601
-        }
+
+  var local_data_set = null;
+  local_data_set = {
+    xresloader : {
+      role_cfg_header : {
+        xres_ver : "1.4.3",
+        hash_code : "no hash code",
+        data_ver : "1.4.3.20180329102023",
+        count : 7
       },
-      cost_value : 999,
-      id : 10006
-    }
-  ];
-  var extend = function (dst, src) {
-    for (var k in src) {
-      var v = src[k];
-      if (undefined === dst[k] || 'object' != typeof(v)) {
-        dst[k] = v;
-      } else {
-        if ('object' != typeof(dst[k])) {
-          dst[k] = {};
+      role_cfg : [
+        {
+          test_array : [
+            "lalal",
+            "欧若拉",
+            "小魔女"
+          ],
+          name : "欧若拉",
+          dep_test : {
+            name : "123.0",
+            id : 51,
+            dep2 : {
+              level : "2014-10-13",
+              id : 101
+            }
+          },
+          cost_value : 1,
+          id : 10001
+        },
+        {
+          unlock_level : 39,
+          test_array : [
+            "blebleble",
+            "杰克",
+            "海盗王子"
+          ],
+          name : "杰克",
+          dep_test : {
+            name : "654.0",
+            id : 61,
+            dep2 : {
+              level : "2014-10-14",
+              id : 201
+            }
+          },
+          cost_value : 2,
+          id : 10002
+        },
+        {
+          unlock_level : 85,
+          test_array : [
+            "hahaha",
+            "库拉",
+            "喵少年"
+          ],
+          name : "库拉",
+          dep_test : {
+            name : "sdadasd",
+            id : 71,
+            dep2 : {
+              level : "2014-10-15",
+              id : 301
+            }
+          },
+          cost_value : 4,
+          id : 10003
+        },
+        {
+          unlock_level : 122,
+          test_array : [
+            "angel",
+            "莫瑞茨"
+          ],
+          name : "莫瑞茨",
+          dep_test : {
+            name : "ffff",
+            id : 81,
+            dep2 : {
+              level : "19:10:50",
+              id : 401
+            }
+          },
+          cost_value : 8,
+          id : 10004
+        },
+        {
+          unlock_level : 183,
+          cost_type : 10001,
+          test_array : [
+            "laopo",
+            "爱丽丝"
+          ],
+          name : "爱丽丝",
+          dep_test : {
+            name : "gggg",
+            id : 91,
+            dep2 : {
+              level : "09:10:50",
+              id : 501
+            }
+          },
+          cost_value : 99999,
+          id : 10005
+        },
+        {
+          unlock_level : 274,
+          cost_type : 10101,
+          test_array : [
+            "keai",
+            "都玛西亚"
+          ],
+          name : "都玛西亚",
+          dep_test : {
+            name : "hhhhh",
+            id : 101,
+            dep2 : {
+              level : "2014-50-20 07:50:50",
+              id : 601
+            }
+          },
+          cost_value : 999,
+          id : 10006
         }
-        extend(dst[k], v)
-      }
+      ]
     }
   };
-  try { extend(window, { "sample" : { role_cfg : role_cfg } }); }
-  catch(e) { extend(global, { "sample" : { role_cfg : role_cfg } }); }
+  try { extend(window, { "sample" : local_data_set }); }
+  catch(e) { extend(global, { "sample" : local_data_set }); }
+
 })();
diff --git a/sample/proto_v2/role_cfg.json b/sample/proto_v2/role_cfg.json
@@ -1 +1 @@
-[{"count":7,"xres_ver":"1.4.2","hash_code":"no hash code","data_ver":"1.4.2.20180317091854"},{"role_cfg":[{"name":"欧若拉","dep_test":{"name":"123.0","dep2":{"level":"2014-10-13","id":101},"id":51},"cost_value":1,"id":10001,"test_array":["lalal","欧若拉","小魔女"]},{"name":"杰克","dep_test":{"name":"654.0","dep2":{"level":"2014-10-14","id":201},"id":61},"cost_value":2,"unlock_level":39,"id":10002,"test_array":["blebleble","杰克","海盗王子"]},{"name":"库拉","dep_test":{"name":"sdadasd","dep2":{"level":"2014-10-15","id":301},"id":71},"cost_value":4,"unlock_level":85,"id":10003,"test_array":["hahaha","库拉","喵少年"]},{"name":"莫瑞茨","dep_test":{"name":"ffff","dep2":{"level":"19:10:50","id":401},"id":81},"cost_value":8,"unlock_level":122,"id":10004,"test_array":["angel","莫瑞茨"]},{"unlock_level":183,"cost_type":10001,"test_array":["laopo","爱丽丝"],"name":"爱丽丝","dep_test":{"name":"gggg","dep2":{"level":"09:10:50","id":501},"id":91},"cost_value":99999,"id":10005},{"unlock_level":274,"cost_type":10101,"test_array":["keai","都玛西亚"],"name":"都玛西亚","dep_test":{"name":"hhhhh","dep2":{"level":"2014-50-20 07:50:50","id":601},"id":101},"cost_value":999,"id":10006}]}]
+[{"count":7,"xres_ver":"1.4.3","hash_code":"no hash code","data_ver":"1.4.3.20180329102023"},{"role_cfg":[{"name":"欧若拉","dep_test":{"name":"123.0","dep2":{"level":"2014-10-13","id":101},"id":51},"cost_value":1,"id":10001,"test_array":["lalal","欧若拉","小魔女"]},{"name":"杰克","dep_test":{"name":"654.0","dep2":{"level":"2014-10-14","id":201},"id":61},"cost_value":2,"unlock_level":39,"id":10002,"test_array":["blebleble","杰克","海盗王子"]},{"name":"库拉","dep_test":{"name":"sdadasd","dep2":{"level":"2014-10-15","id":301},"id":71},"cost_value":4,"unlock_level":85,"id":10003,"test_array":["hahaha","库拉","喵少年"]},{"name":"莫瑞茨","dep_test":{"name":"ffff","dep2":{"level":"19:10:50","id":401},"id":81},"cost_value":8,"unlock_level":122,"id":10004,"test_array":["angel","莫瑞茨"]},{"unlock_level":183,"cost_type":10001,"test_array":["laopo","爱丽丝"],"name":"爱丽丝","dep_test":{"name":"gggg","dep2":{"level":"09:10:50","id":501},"id":91},"cost_value":99999,"id":10005},{"unlock_level":274,"cost_type":10101,"test_array":["keai","都玛西亚"],"name":"都玛西亚","dep_test":{"name":"hhhhh","dep2":{"level":"2014-50-20 07:50:50","id":601},"id":101},"cost_value":999,"id":10006}]}]
diff --git a/sample/proto_v2/role_cfg.lua b/sample/proto_v2/role_cfg.lua
@@ -2,7 +2,7 @@
 
 return {
     [1] = {
-        xres_ver = "1.4.2",
+        xres_ver = "1.4.3",
         hash_code = "no hash code",
         data_ver = "1.0.0.0",
         count = 7,

diff --git a/sample/proto_v2/role_cfg.msgpack.bin b/sample/proto_v2/role_cfg.msgpack.bin