zero-tools 1.5.0 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/ZeroWorkBook.ts +2 -2
  2. package/bin.ts +3 -2
  3. package/dist/ZeroWorkBook.js +2 -2
  4. package/dist/bin.js +22 -11
  5. package/dist/tinify.js +19 -9
  6. package/dist/xlsx-ts.js +1 -2
  7. package/package.json +1 -1
package/ZeroWorkBook.ts CHANGED
@@ -82,7 +82,7 @@ export class ZeroTable {
82
82
  let typeCell = sheet[utils.encode_cell({ c: index, r: row })] as CellObject
83
83
 
84
84
  let isSkip = false
85
- if (checkColumn) {
85
+ if (checkColumn != null) {
86
86
  let checkColumnCell = sheet[utils.encode_cell({ c: checkColumn, r: row })] as CellObject
87
87
  if (!this.checkCell(checkColumnCell)) {
88
88
  isSkip = true
@@ -125,7 +125,7 @@ export class ZeroTable {
125
125
  for (let row = startRow; row <= range.e.r; row++) {
126
126
  let item: any = []
127
127
  let isSkip = false
128
- if (checkColumn) {
128
+ if (checkColumn != null) {
129
129
  let cell = sheet[utils.encode_cell({ c: checkColumn, r: row })] as CellObject
130
130
  if (!this.checkCell(cell)) {
131
131
  isSkip = true
package/bin.ts CHANGED
@@ -137,7 +137,7 @@ let helpString = `
137
137
  ----------------------开发工具包-----------------------
138
138
  zero ut (zero --unitTesting)在当前文件夹新建TS单元测试项目
139
139
  zero xt (zero --xlsxToTs)在当前文件夹下的xlsx.json中所描述的Excel文件转换TS文件
140
- zero xb (zero --xlsxToBin)在当前文件夹下的xlsx.json中所描述的Excel文件转换TS文件或二进制文件
140
+ zero xb (zero --xlsxToBin)在当前文件夹下的zeroconfig.config.js中所描述的Excel文件转换TS文件或二进制文件
141
141
  zero ty (zero --tinify)在当前文件夹下的tinify.json中所描述的文件进行压缩
142
142
  zero pp (zero --packHotup)在当前文件夹下的packHotup.json中所描述的文件进行打包热更新
143
143
  zero h (zero --help)帮助
@@ -268,6 +268,7 @@ exports.test = ` + JSON.stringify(book.toJson(), null, 4))
268
268
  let tsPath = path.join(info.tsPath, rootName + ".ts")
269
269
  fs.writeFileSync(tsPath, `${book.toTS(rootName + "Root")}
270
270
  export let ${rootName}: ${rootInterface} = ${JSON.stringify(book.toJson(), null, 4)}`)
271
+ console.log("成功导出配置表到ts文件" + tsPath)
271
272
  }
272
273
  }
273
274
  })
@@ -304,7 +305,7 @@ export let ${rootName}: ${rootInterface} = ${JSON.stringify(book.toJson(), null,
304
305
  console.log(helpString)
305
306
  },
306
307
  v: () => {
307
- console.log("1.5.0")
308
+ console.log("1.5.1")
308
309
  }
309
310
  }
310
311
  let isFree = true
package/dist/ZeroWorkBook.js CHANGED
@@ -49,7 +49,7 @@ var ZeroTable = /** @class */ (function () {
49
49
  for (var row = startRow; row <= range.e.r; row++) {
50
50
  var typeCell = sheet[xlsx_1.utils.encode_cell({ c: index, r: row })];
51
51
  var isSkip = false;
52
- if (checkColumn) {
52
+ if (checkColumn != null) {
53
53
  var checkColumnCell = sheet[xlsx_1.utils.encode_cell({ c: checkColumn, r: row })];
54
54
  if (!this.checkCell(checkColumnCell)) {
55
55
  isSkip = true;
@@ -91,7 +91,7 @@ var ZeroTable = /** @class */ (function () {
91
91
  var _loop_1 = function (row) {
92
92
  var item = [];
93
93
  var isSkip = false;
94
- if (checkColumn) {
94
+ if (checkColumn != null) {
95
95
  var cell = sheet[xlsx_1.utils.encode_cell({ c: checkColumn, r: row })];
96
96
  if (!this_1.checkCell(cell)) {
97
97
  isSkip = true;
package/dist/bin.js CHANGED
@@ -16,13 +16,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
16
16
  }) : function(o, v) {
17
17
  o["default"] = v;
18
18
  });
19
- var __importStar = (this && this.__importStar) || function (mod) {
20
- if (mod && mod.__esModule) return mod;
21
- var result = {};
22
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
23
- __setModuleDefault(result, mod);
24
- return result;
25
- };
19
+ var __importStar = (this && this.__importStar) || (function () {
20
+ var ownKeys = function(o) {
21
+ ownKeys = Object.getOwnPropertyNames || function (o) {
22
+ var ar = [];
23
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
24
+ return ar;
25
+ };
26
+ return ownKeys(o);
27
+ };
28
+ return function (mod) {
29
+ if (mod && mod.__esModule) return mod;
30
+ var result = {};
31
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
32
+ __setModuleDefault(result, mod);
33
+ return result;
34
+ };
35
+ })();
26
36
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
27
37
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
28
38
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -33,8 +43,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
33
43
  });
34
44
  };
35
45
  var __generator = (this && this.__generator) || function (thisArg, body) {
36
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
37
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
46
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
47
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
38
48
  function verb(n) { return function (v) { return step([n, v]); }; }
39
49
  function step(op) {
40
50
  if (f) throw new TypeError("Generator is already executing.");
@@ -91,7 +101,7 @@ var tsconfigTem = "\n{\n \"compilerOptions\": {\n /* Basic Options */\n
91
101
  var indexTem = "\nlet a=\"test\"\nconsole.log(a)\n";
92
102
  var cwsTem = "\n{\n\t\"folders\": [\n\t\t{\n\t\t\t\"path\": \".\"\n\t\t}\n\t],\n\t\"settings\": {}\n}\n";
93
103
  var launchTem = "\n{\n \"version\": \"0.2.0\",\n \"configurations\": [\n {\n \"type\": \"node\",\n \"request\": \"launch\",\n \"name\": \"\u542F\u52A8\",\n \"runtimeExecutable\": \"yarn\",\n \"args\": [\n \"debug\",\n ],\n },\n ]\n}\n";
94
- var helpString = "\n----------------------\u5F00\u53D1\u5DE5\u5177\u5305-----------------------\nzero ut (zero --unitTesting)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u65B0\u5EFATS\u5355\u5143\u6D4B\u8BD5\u9879\u76EE\nzero xt (zero --xlsxToTs)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684xlsx.json\u4E2D\u6240\u63CF\u8FF0\u7684Excel\u6587\u4EF6\u8F6C\u6362TS\u6587\u4EF6\nzero xb (zero --xlsxToBin)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684xlsx.json\u4E2D\u6240\u63CF\u8FF0\u7684Excel\u6587\u4EF6\u8F6C\u6362TS\u6587\u4EF6\u6216\u4E8C\u8FDB\u5236\u6587\u4EF6\nzero ty (zero --tinify)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684tinify.json\u4E2D\u6240\u63CF\u8FF0\u7684\u6587\u4EF6\u8FDB\u884C\u538B\u7F29\nzero pp (zero --packHotup)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684packHotup.json\u4E2D\u6240\u63CF\u8FF0\u7684\u6587\u4EF6\u8FDB\u884C\u6253\u5305\u70ED\u66F4\u65B0\nzero h (zero --help)\u5E2E\u52A9\nzero v (zero --version)\u7248\u672C\u53F7\n----------------------\u84DD\u9762\u5305 \u5236\u4F5C----------------------";
104
+ var helpString = "\n----------------------\u5F00\u53D1\u5DE5\u5177\u5305-----------------------\nzero ut (zero --unitTesting)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u65B0\u5EFATS\u5355\u5143\u6D4B\u8BD5\u9879\u76EE\nzero xt (zero --xlsxToTs)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684xlsx.json\u4E2D\u6240\u63CF\u8FF0\u7684Excel\u6587\u4EF6\u8F6C\u6362TS\u6587\u4EF6\nzero xb (zero --xlsxToBin)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684zeroconfig.config.js\u4E2D\u6240\u63CF\u8FF0\u7684Excel\u6587\u4EF6\u8F6C\u6362TS\u6587\u4EF6\u6216\u4E8C\u8FDB\u5236\u6587\u4EF6\nzero ty (zero --tinify)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684tinify.json\u4E2D\u6240\u63CF\u8FF0\u7684\u6587\u4EF6\u8FDB\u884C\u538B\u7F29\nzero pp (zero --packHotup)\u5728\u5F53\u524D\u6587\u4EF6\u5939\u4E0B\u7684packHotup.json\u4E2D\u6240\u63CF\u8FF0\u7684\u6587\u4EF6\u8FDB\u884C\u6253\u5305\u70ED\u66F4\u65B0\nzero h (zero --help)\u5E2E\u52A9\nzero v (zero --version)\u7248\u672C\u53F7\n----------------------\u84DD\u9762\u5305 \u5236\u4F5C----------------------";
95
105
  var fn = {
96
106
  ut: function () {
97
107
  fs.writeFileSync(cwd + "/package.json", packageTem);
@@ -193,6 +203,7 @@ var fn = {
193
203
  var rootInterface = "I" + rootName.replace(/(\w)/, function (v) { return v.toUpperCase(); }) + "Root";
194
204
  var tsPath = path.join(info.tsPath, rootName + ".ts");
195
205
  fs.writeFileSync(tsPath, "".concat(book.toTS(rootName + "Root"), "\nexport let ").concat(rootName, ": ").concat(rootInterface, " = ").concat(JSON.stringify(book.toJson(), null, 4)));
206
+ console.log("成功导出配置表到ts文件" + tsPath);
196
207
  }
197
208
  }
198
209
  });
@@ -233,7 +244,7 @@ var fn = {
233
244
  console.log(helpString);
234
245
  },
235
246
  v: function () {
236
- console.log("1.5.0");
247
+ console.log("1.5.1");
237
248
  }
238
249
  };
239
250
  var isFree = true;
package/dist/tinify.js CHANGED
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
15
15
  }) : function(o, v) {
16
16
  o["default"] = v;
17
17
  });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
25
35
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
36
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
37
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -32,8 +42,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
32
42
  });
33
43
  };
34
44
  var __generator = (this && this.__generator) || function (thisArg, body) {
35
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
36
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
45
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
46
+ return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
37
47
  function verb(n) { return function (v) { return step([n, v]); }; }
38
48
  function step(op) {
39
49
  if (f) throw new TypeError("Generator is already executing.");
package/dist/xlsx-ts.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.xlsxToTs = void 0;
6
+ exports.xlsxToTs = xlsxToTs;
7
7
  var path_1 = __importDefault(require("path"));
8
8
  var xlsx_1 = require("xlsx");
9
9
  var shell_ts_1 = require("./shell-ts");
@@ -42,4 +42,3 @@ function xlsxToTs(xlsxFile, savePath, checkCell, startCell, note) {
42
42
  });
43
43
  pr.save(savePath);
44
44
  }
45
- exports.xlsxToTs = xlsxToTs;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zero-tools",
3
- "version": "1.5.0",
3
+ "version": "1.5.2",
4
4
  "description": "Zero游戏开发工具",
5
5
  "main": "index.ts",
6
6
  "scripts": {