tfose5-xlsx 3.4.4 → 3.5.4

package/README.md

@@ -1 +1 @@
-# ![Version](https://img.shields.io/badge/version-3.4.4-green.svg)
+# ![Version](https://img.shields.io/badge/version-3.5.4-green.svg)

package/dist/parse-to-enum-json.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseXlsxToEnumJson = parseXlsxToEnumJson;
+const node_xlsx_1 = require("node-xlsx");
 const path_1 = require("path");
 const tfose5_fs_1 = require("tfose5-fs");
-const xlsx_1 = require("xlsx");
 const converter_factory_1 = require("./converter-factory");
 const to_asset_converter_1 = require("./to-asset-converter");
 const to_bool_converter_1 = require("./to-bool-converter");
@@ -37,11 +37,12 @@ function parseXlsxToEnumJson(fsFactory, dstDirPath, srcDirPath, topEnums) {
             rewards: new to_rewards_converter_1.ToRewardsConverter(toEnumNoConverter, topEnums[topEnums.length - 1]),
             unit: new to_unix_converter_1.ToUnixConverter(),
         });
+        const topFiles = topEnums.map(r => r + '.xlsx');
         const filePaths = [];
         yield fsFactory.build(tfose5_fs_1.FsScanBase).scan({
             fileAction: (filePath) => __awaiter(this, void 0, void 0, function* () {
-                const ok = topEnums.some(r => {
-                    return filePath.includes(r);
+                const ok = topFiles.some(r => {
+                    return (0, path_1.basename)(filePath) == r;
                 });
                 if (ok)
                     return;
@@ -49,47 +50,55 @@ function parseXlsxToEnumJson(fsFactory, dstDirPath, srcDirPath, topEnums) {
             }),
             path: srcDirPath,
         });
-        topEnums.forEach(r => {
-            filePaths.unshift((0, path_1.join)(srcDirPath, r + '.xlsx'));
+        topFiles.forEach(r => {
+            filePaths.unshift((0, path_1.join)(srcDirPath, r));
         });
         for (const r of filePaths) {
             if (r.includes('~'))
                 continue;
-            const sheets = (0, xlsx_1.readFile)(r).Sheets;
             const enumName = (0, path_1.basename)(r).replace('.xlsx', '');
             console.log(`xlsx: ${enumName}`);
-            const allOtherSheetRows = {};
-            for (const k in sheets) {
-                if (k == enumName)
-                    continue;
-                console.log(`  sheet: ${k}`);
-                allOtherSheetRows[k] = parseSheet(sheets[k]);
-            }
-            console.log(`  sheet: ${enumName}`);
-            const enumItems = parseSheet(sheets[enumName], allOtherSheetRows);
-            if ((_a = enumItems[0]) === null || _a === void 0 ? void 0 : _a.text) {
-                allEnumTextNo[enumName] = enumItems.reduce((memo, r) => {
+            const res = (0, node_xlsx_1.parse)(r).map(r => {
+                return {
+                    sort: r.name == enumName ? 'zzz' : r.name,
+                    sheet: r,
+                };
+            }).sort((a, b) => {
+                return a.sort.localeCompare(b.sort);
+            }).map(r => r.sheet).reduce((memo, r) => {
+                console.log(`  sheet: ${r.name}`);
+                if (r.name == enumName)
+                    memo.enumItems = parseSheet(r.data, memo.allOtherSheetRows);
+                else
+                    memo.allOtherSheetRows[r.name] = parseSheet(r.data);
+                return memo;
+            }, {
+                enumItems: [],
+                allOtherSheetRows: {},
+            });
+            if ((_a = res.enumItems[0]) === null || _a === void 0 ? void 0 : _a.text) {
+                allEnumTextNo[enumName] = res.enumItems.reduce((memo, r) => {
                     memo[r.text] = r.value;
                     return memo;
                 }, {});
             }
             yield fsFactory.build(tfose5_fs_1.FsWriteBase).write({
-                data: enumItems,
+                data: res.enumItems,
                 json: true,
                 path: (0, path_1.join)(dstDirPath, enumName + '.json'),
             });
         }
     });
 }
-function parseSheet(sheet, allOtherSheetRows) {
-    return xlsx_1.utils.sheet_to_json(sheet).map((r, i) => {
-        return i ? Object.entries(r).reduce((memo, cr) => {
-            var _a, _b;
-            const [field, type, ext] = cr[0].split(':');
+function parseSheet(sheetRows, allOtherSheetRows) {
+    return sheetRows.slice(2).map(r => {
+        return r.length ? sheetRows[0].reduce((memo, cr, ci) => {
+            var _a, _b, _c;
+            const [field, type, ext] = cr.split(':');
             let fieldValue;
             if (type == '#') {
                 fieldValue = ((_a = allOtherSheetRows[ext]) !== null && _a !== void 0 ? _a : []).filter(sr => {
-                    return cr[1] == sr.group;
+                    return r[ci] == sr.group;
                 }).map(sr => {
                     const copy = structuredClone(sr);
                     delete copy.group;
@@ -98,12 +107,12 @@ function parseSheet(sheet, allOtherSheetRows) {
                 });
             }
             else if (type == 'array') {
-                fieldValue = cr[1].toString().split(/\r\n|\n|\r/g).map(sr => {
+                fieldValue = r[ci] ? r[ci].toString().split(/\r\n|\n|\r/g).map(sr => {
                     return converterFactory.build(ext).convert(sr, ext);
-                });
+                }) : undefined;
             }
             else {
-                fieldValue = converterFactory.build(type).convert(cr[1], type);
+                fieldValue = r[ci] ? converterFactory.build(type).convert(r[ci], type) : undefined;
             }
             const fieldParts = field.split('.');
             let obj = memo;
@@ -114,7 +123,7 @@ function parseSheet(sheet, allOtherSheetRows) {
                     obj = obj[name];
                 }
                 else {
-                    obj[name] = fieldValue;
+                    (_c = obj[name]) !== null && _c !== void 0 ? _c : (obj[name] = fieldValue);
                 }
             }
             return memo;

package/package.json

@@ -2,8 +2,8 @@
     "author": "ahl5esoft",
     "dependencies": {
         "dayjs": "^1.11.20",
-        "tfose5-fs": "^1.6.1",
-        "xlsx": "^0.18.5"
+        "node-xlsx": "^0.24.0",
+        "tfose5-fs": "^1.6.1"
     },
     "devDependencies": {
         "@types/mocha": "^10.0.10",
@@ -24,5 +24,5 @@
         "test": "mocha -t 30s -r ./node_modules/ts-node/register/index.js --exit",
         "version": "ts-node script version"
     },
-    "version": "3.4.4"
+    "version": "3.5.4"
 }