@fileverse-dev/fortune-core 1.0.62 → 1.0.63

package/es/modules/formula.js

@@ -18,7 +18,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 import _ from "lodash";
-import { Parser, ERROR_REF } from "@fileverse-dev/formula-parser/src/index";
+import { Parser, ERROR_REF } from "@fileverse-dev/formula-parser";
 import { getFlowdata } from "../context";
 import { columnCharToIndex, escapeScriptTag, getSheetIndex, indexToColumnChar, getSheetIdByName, escapeHTMLTag } from "../utils";
 import { getcellFormula, getRangetxt, mergeMoveMain, setCellValue } from "./cell";
@@ -121,7 +121,8 @@ var FormulaCache = function () {
   }
   FormulaCache.prototype.tryGetCellAsNumber = function (cell) {
     var _a, _b, _c, _d;
-    if (((_a = cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC"))) {
+    var isCryptoDeno = ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC"));
+    if (isCryptoDeno) {
       var splitedNumberString = cell.m.split(" ")[0];
       return Number(splitedNumberString);
     }

package/lib/modules/formula.js

@@ -28,7 +28,7 @@ exports.rangeHightlightselected = rangeHightlightselected;
 exports.rangeSetValue = rangeSetValue;
 exports.setCaretPosition = setCaretPosition;
 var _lodash = _interopRequireDefault(require("lodash"));
-var _index = require("@fileverse-dev/formula-parser/src/index");
+var _formulaParser = require("@fileverse-dev/formula-parser");
 var _context = require("../context");
 var _utils = require("../utils");
 var _cell = require("./cell");
@@ -87,12 +87,12 @@ var FormulaCache = exports.FormulaCache = function () {
     this.functionlistMap = {};
     this.execFunctionGlobalData = {};
     this.cellTextToIndexList = {};
-    this.parser = new _index.Parser();
+    this.parser = new _formulaParser.Parser();
     this.parser.on("callCellValue", function (cellCoord, options, done) {
       var _a, _b;
       var context = that.parser.context;
       var id = cellCoord.sheetName == null ? options.sheetId : (0, _utils.getSheetIdByName)(context, cellCoord.sheetName);
-      if (id == null) throw Error(_index.ERROR_REF);
+      if (id == null) throw Error(_formulaParser.ERROR_REF);
       var flowdata = (0, _context.getFlowdata)(context, id);
       var cell = ((_a = context === null || context === void 0 ? void 0 : context.formulaCache.execFunctionGlobalData) === null || _a === void 0 ? void 0 : _a["".concat(cellCoord.row.index, "_").concat(cellCoord.column.index, "_").concat(id)]) || ((_b = flowdata === null || flowdata === void 0 ? void 0 : flowdata[cellCoord.row.index]) === null || _b === void 0 ? void 0 : _b[cellCoord.column.index]);
       var v = that.tryGetCellAsNumber(cell);
@@ -102,7 +102,7 @@ var FormulaCache = exports.FormulaCache = function () {
       var _a, _b, _c, _d, _e, _f, _g;
       var context = that.parser.context;
       var id = startCellCoord.sheetName == null ? options.sheetId : (0, _utils.getSheetIdByName)(context, startCellCoord.sheetName);
-      if (id == null) throw Error(_index.ERROR_REF);
+      if (id == null) throw Error(_formulaParser.ERROR_REF);
       var flowdata = (0, _context.getFlowdata)(context, id);
       var fragment = [];
       var startRow = startCellCoord.row.index;
@@ -119,7 +119,7 @@ var FormulaCache = exports.FormulaCache = function () {
         startCol = 0;
         endCol = (_b = flowdata === null || flowdata === void 0 ? void 0 : flowdata[0].length) !== null && _b !== void 0 ? _b : 0;
       }
-      if (emptyRow && emptyCol) throw Error(_index.ERROR_REF);
+      if (emptyRow && emptyCol) throw Error(_formulaParser.ERROR_REF);
       var cryptoDenomination = "";
       var cryptoDecimal = 0;
       for (var row = startRow; row <= endRow; row += 1) {
@@ -151,7 +151,8 @@ var FormulaCache = exports.FormulaCache = function () {
   }
   FormulaCache.prototype.tryGetCellAsNumber = function (cell) {
     var _a, _b, _c, _d;
-    if (((_a = cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC"))) {
+    var isCryptoDeno = ((_a = cell === null || cell === void 0 ? void 0 : cell.m) === null || _a === void 0 ? void 0 : _a.includes("ETH")) || ((_b = cell === null || cell === void 0 ? void 0 : cell.m) === null || _b === void 0 ? void 0 : _b.includes("SOL")) || ((_c = cell === null || cell === void 0 ? void 0 : cell.m) === null || _c === void 0 ? void 0 : _c.includes("BTC"));
+    if (isCryptoDeno) {
       var splitedNumberString = cell.m.split(" ")[0];
       return Number(splitedNumberString);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.0.62",
+  "version": "1.0.63",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
     "dev": "father-build --watch"
   },
   "dependencies": {
-    "@fileverse-dev/formula-parser": "0.2.39",
+    "@fileverse-dev/formula-parser": "0.2.40",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",