@fileverse-dev/fortune-core 1.1.66-error-2 → 1.1.66-error-4

package/es/canvas.js

@@ -1122,29 +1122,29 @@ var Canvas = function () {
       endY: cellsize[3] + cellsize[1]
     }, renderCtx);
     if (cell === null || cell === void 0 ? void 0 : cell.error) {
-      var errorColor = "#FB3449";
-      var bw = 1;
-      var L = Math.round(startX + offsetLeft - 1 + bodrder05);
-      var T = Math.round(startY + offsetTop - 1 + bodrder05);
-      var R = Math.round(endX + offsetLeft - 2 + bodrder05);
-      var B = Math.round(endY + offsetTop - 2 + bodrder05);
-      var wInside = R - L;
-      var hInside = B - T;
-      var ctx2 = renderCtx;
-      ctx2.save();
-      ctx2.fillStyle = errorColor;
-      ctx2.fillRect(L, T, wInside, bw);
-      ctx2.fillRect(L, B - bw, wInside, bw);
-      ctx2.fillRect(L, T, bw, hInside);
-      ctx2.fillRect(R - bw, T, bw, hInside);
-      var ribbon = 8 * this.sheetCtx.zoomRatio;
-      ctx2.beginPath();
-      ctx2.moveTo(L + bw, T + bw);
-      ctx2.lineTo(L + bw + ribbon, T + bw);
-      ctx2.lineTo(L + bw, T + bw + ribbon);
-      ctx2.closePath();
-      ctx2.fill();
-      ctx2.restore();
+      var errorBorderColor = "#FB3449";
+      var borderThicknessInPixels = 1;
+      var leftCellBoundary = Math.round(startX + offsetLeft - 3 + bodrder05);
+      var topCellBoundary = Math.round(startY + offsetTop - 3 + bodrder05);
+      var rightCellBoundary = Math.round(endX + offsetLeft - 3 + bodrder05);
+      var bottomCellBoundary = Math.round(endY + offsetTop - 3 + bodrder05);
+      var innerCellWidth = rightCellBoundary - leftCellBoundary;
+      var innerCellHeight = bottomCellBoundary - topCellBoundary;
+      var renderingContext = renderCtx;
+      renderingContext.save();
+      renderingContext.fillStyle = errorBorderColor;
+      renderingContext.fillRect(leftCellBoundary, topCellBoundary, innerCellWidth, borderThicknessInPixels);
+      renderingContext.fillRect(leftCellBoundary, bottomCellBoundary - borderThicknessInPixels, innerCellWidth, borderThicknessInPixels);
+      renderingContext.fillRect(leftCellBoundary, topCellBoundary, borderThicknessInPixels, innerCellHeight);
+      renderingContext.fillRect(rightCellBoundary - borderThicknessInPixels, topCellBoundary, borderThicknessInPixels, innerCellHeight);
+      var errorRibbonSize = 8 * this.sheetCtx.zoomRatio;
+      renderingContext.beginPath();
+      renderingContext.moveTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels);
+      renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels + errorRibbonSize, topCellBoundary + borderThicknessInPixels);
+      renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels + errorRibbonSize);
+      renderingContext.closePath();
+      renderingContext.fill();
+      renderingContext.restore();
     }
   };
   Canvas.prototype.cellOverflowRender = function (r, c, stc, edc, renderCtx, scrollHeight, scrollWidth, offsetLeft, offsetTop, afCompute, cfCompute) {

package/es/modules/error-state-helpers.d.ts

@@ -3,7 +3,3 @@ import { CellError } from "../types";
 export declare function overShowError(ctx: Context, e: MouseEvent, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement): void;
 export declare function setCellError(ctx: Context, r: number, c: number, err: CellError): void;
 export declare function clearCellError(ctx: Context, r: number, c: number): void;
-export declare function showErrors(ctx: Context, errorShowCells: {
-    r: number;
-    c: number;
-}[]): void;

package/es/modules/error-state-helpers.js

@@ -10,7 +10,6 @@ var __assign = this && this.__assign || function () {
 };
 import _ from "lodash";
 import { getFlowdata } from "../context";
-import { getCommentBoxByRC } from "./comment";
 import { colLocation, rowLocation } from "./location";
 import { mergeBorder } from "./cell";
 export function overShowError(ctx, e, scrollX, scrollY, container) {
@@ -80,14 +79,4 @@ export function clearCellError(ctx, r, c) {
   var flow = getFlowdata(ctx);
   if (!((_a = flow === null || flow === void 0 ? void 0 : flow[r]) === null || _a === void 0 ? void 0 : _a[c])) return;
   delete flow[r][c].error;
-}
-export function showErrors(ctx, errorShowCells) {
-  var flowdata = getFlowdata(ctx);
-  if (!flowdata) return;
-  var errorBoxes = errorShowCells.map(function (_a) {
-    var r = _a.r,
-      c = _a.c;
-    return getCommentBoxByRC(ctx, flowdata, r, c);
-  });
-  ctx.errorBoxes = errorBoxes;
 }

package/es/modules/formula.js

@@ -18,12 +18,12 @@ 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";
+import _ from "lodash";
 import { getFlowdata } from "../context";
 import { columnCharToIndex, escapeScriptTag, getSheetIndex, indexToColumnChar, getSheetIdByName, escapeHTMLTag } from "../utils";
 import { getcellFormula, getRangetxt, mergeMoveMain, setCellValue } from "./cell";
-import { error } from "./validation";
+import { customErrorMessage, error, detectErrorFromValue } from "./validation";
 import { locale } from "../locale";
 import { colors } from "./color";
 import { colLocation, mousePosition, rowLocation } from "./location";
@@ -730,16 +730,17 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
     finalResult = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
   }
   var isError = !_.isNil(formulaError);
-  if (isError) {
+  var detectedErrorFromValue = detectErrorFromValue(finalResult === null || finalResult === void 0 ? void 0 : finalResult.toString());
+  if (isError || detectedErrorFromValue) {
     setCellError(ctx, r, c, {
       row_column: "".concat(r, "_").concat(c),
       title: "Error",
-      message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || "Unknown Error"
+      message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || detectedErrorFromValue || "Unknown Error"
     });
   } else {
     clearCellError(ctx, r, c);
   }
-  return [true, !isError ? finalResult : formulaError, txt];
+  return [true, !isError ? finalResult : customErrorMessage(formulaError), txt];
 }
 function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
   var r = dynamicArrayItem.r,

package/es/modules/validation.d.ts

@@ -9,6 +9,9 @@ export declare const error: {
     nl: string;
     sp: string;
 };
+export declare const errorMessagesFromValue: Record<string, string>;
+export declare function detectErrorFromValue(input: string): string;
+export declare function customErrorMessage(errorMessage: string): string;
 export declare function valueIsError(value: string): boolean;
 export declare function isRealNull(val: any): boolean;
 export declare function isHexValue(str: string): boolean;

package/es/modules/validation.js

@@ -1,5 +1,7 @@
+var _a;
 import dayjs from "dayjs";
 import _ from "lodash";
+import { error as cellErrorMessages, ERROR_NAME, ERROR_DIV_ZERO, ERROR_NULL, ERROR_NUM, ERROR_REF, ERROR_VALUE, ERROR } from "@fileverse-dev/formula-parser";
 import { hasChinaword } from "./text";
 export var error = {
   v: "#VALUE!",
@@ -11,6 +13,16 @@ export var error = {
   nl: "#NULL!",
   sp: "#SPILL!"
 };
+export var errorMessagesFromValue = (_a = {}, _a[ERROR_DIV_ZERO] = "Invalid calculation: the divisor (second value) cannot be zero", _a[ERROR_NAME] = "Wrong function name or parameter", _a[ERROR_NULL] = "Formula returned null", _a[ERROR_NUM] = "Invalid number", _a[ERROR_REF] = "Invalid reference", _a[ERROR_VALUE] = "Invalid value", _a[ERROR] = "Unknown error", _a);
+export function detectErrorFromValue(input) {
+  return errorMessagesFromValue[input];
+}
+export function customErrorMessage(errorMessage) {
+  if (errorMessage === cellErrorMessages(ERROR_NAME)) {
+    return "#ERROR";
+  }
+  return errorMessage;
+}
 var errorValues = Object.values(error);
 export function valueIsError(value) {
   return errorValues.includes(value);

package/lib/canvas.js

@@ -1129,29 +1129,29 @@ var Canvas = exports.Canvas = function () {
       endY: cellsize[3] + cellsize[1]
     }, renderCtx);
     if (cell === null || cell === void 0 ? void 0 : cell.error) {
-      var errorColor = "#FB3449";
-      var bw = 1;
-      var L = Math.round(startX + offsetLeft - 1 + bodrder05);
-      var T = Math.round(startY + offsetTop - 1 + bodrder05);
-      var R = Math.round(endX + offsetLeft - 2 + bodrder05);
-      var B = Math.round(endY + offsetTop - 2 + bodrder05);
-      var wInside = R - L;
-      var hInside = B - T;
-      var ctx2 = renderCtx;
-      ctx2.save();
-      ctx2.fillStyle = errorColor;
-      ctx2.fillRect(L, T, wInside, bw);
-      ctx2.fillRect(L, B - bw, wInside, bw);
-      ctx2.fillRect(L, T, bw, hInside);
-      ctx2.fillRect(R - bw, T, bw, hInside);
-      var ribbon = 8 * this.sheetCtx.zoomRatio;
-      ctx2.beginPath();
-      ctx2.moveTo(L + bw, T + bw);
-      ctx2.lineTo(L + bw + ribbon, T + bw);
-      ctx2.lineTo(L + bw, T + bw + ribbon);
-      ctx2.closePath();
-      ctx2.fill();
-      ctx2.restore();
+      var errorBorderColor = "#FB3449";
+      var borderThicknessInPixels = 1;
+      var leftCellBoundary = Math.round(startX + offsetLeft - 3 + bodrder05);
+      var topCellBoundary = Math.round(startY + offsetTop - 3 + bodrder05);
+      var rightCellBoundary = Math.round(endX + offsetLeft - 3 + bodrder05);
+      var bottomCellBoundary = Math.round(endY + offsetTop - 3 + bodrder05);
+      var innerCellWidth = rightCellBoundary - leftCellBoundary;
+      var innerCellHeight = bottomCellBoundary - topCellBoundary;
+      var renderingContext = renderCtx;
+      renderingContext.save();
+      renderingContext.fillStyle = errorBorderColor;
+      renderingContext.fillRect(leftCellBoundary, topCellBoundary, innerCellWidth, borderThicknessInPixels);
+      renderingContext.fillRect(leftCellBoundary, bottomCellBoundary - borderThicknessInPixels, innerCellWidth, borderThicknessInPixels);
+      renderingContext.fillRect(leftCellBoundary, topCellBoundary, borderThicknessInPixels, innerCellHeight);
+      renderingContext.fillRect(rightCellBoundary - borderThicknessInPixels, topCellBoundary, borderThicknessInPixels, innerCellHeight);
+      var errorRibbonSize = 8 * this.sheetCtx.zoomRatio;
+      renderingContext.beginPath();
+      renderingContext.moveTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels);
+      renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels + errorRibbonSize, topCellBoundary + borderThicknessInPixels);
+      renderingContext.lineTo(leftCellBoundary + borderThicknessInPixels, topCellBoundary + borderThicknessInPixels + errorRibbonSize);
+      renderingContext.closePath();
+      renderingContext.fill();
+      renderingContext.restore();
     }
   };
   Canvas.prototype.cellOverflowRender = function (r, c, stc, edc, renderCtx, scrollHeight, scrollWidth, offsetLeft, offsetTop, afCompute, cfCompute) {

package/lib/modules/error-state-helpers.d.ts

@@ -3,7 +3,3 @@ import { CellError } from "../types";
 export declare function overShowError(ctx: Context, e: MouseEvent, scrollX: HTMLDivElement, scrollY: HTMLDivElement, container: HTMLDivElement): void;
 export declare function setCellError(ctx: Context, r: number, c: number, err: CellError): void;
 export declare function clearCellError(ctx: Context, r: number, c: number): void;
-export declare function showErrors(ctx: Context, errorShowCells: {
-    r: number;
-    c: number;
-}[]): void;

package/lib/modules/error-state-helpers.js

@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.clearCellError = clearCellError;
 exports.overShowError = overShowError;
 exports.setCellError = setCellError;
-exports.showErrors = showErrors;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _context = require("../context");
-var _comment = require("./comment");
 var _location = require("./location");
 var _cell = require("./cell");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -90,14 +88,4 @@ function clearCellError(ctx, r, c) {
   var flow = (0, _context.getFlowdata)(ctx);
   if (!((_a = flow === null || flow === void 0 ? void 0 : flow[r]) === null || _a === void 0 ? void 0 : _a[c])) return;
   delete flow[r][c].error;
-}
-function showErrors(ctx, errorShowCells) {
-  var flowdata = (0, _context.getFlowdata)(ctx);
-  if (!flowdata) return;
-  var errorBoxes = errorShowCells.map(function (_a) {
-    var r = _a.r,
-      c = _a.c;
-    return (0, _comment.getCommentBoxByRC)(ctx, flowdata, r, c);
-  });
-  ctx.errorBoxes = errorBoxes;
 }

package/lib/modules/formula.js

@@ -28,8 +28,8 @@ exports.rangeDragRow = rangeDragRow;
 exports.rangeHightlightselected = rangeHightlightselected;
 exports.rangeSetValue = rangeSetValue;
 exports.setCaretPosition = setCaretPosition;
-var _lodash = _interopRequireDefault(require("lodash"));
 var _formulaParser = require("@fileverse-dev/formula-parser");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _context = require("../context");
 var _utils = require("../utils");
 var _cell = require("./cell");
@@ -760,16 +760,17 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
     finalResult = "".concat(resultStr, " ").concat(ctx.formulaCache.parser.cryptoDenomination);
   }
   var isError = !_lodash.default.isNil(formulaError);
-  if (isError) {
+  var detectedErrorFromValue = (0, _validation.detectErrorFromValue)(finalResult === null || finalResult === void 0 ? void 0 : finalResult.toString());
+  if (isError || detectedErrorFromValue) {
     (0, _2.setCellError)(ctx, r, c, {
       row_column: "".concat(r, "_").concat(c),
       title: "Error",
-      message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || "Unknown Error"
+      message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || detectedErrorFromValue || "Unknown Error"
     });
   } else {
     (0, _2.clearCellError)(ctx, r, c);
   }
-  return [true, !isError ? finalResult : formulaError, txt];
+  return [true, !isError ? finalResult : (0, _validation.customErrorMessage)(formulaError), txt];
 }
 function insertUpdateDynamicArray(ctx, dynamicArrayItem) {
   var r = dynamicArrayItem.r,

package/lib/modules/validation.d.ts

@@ -9,6 +9,9 @@ export declare const error: {
     nl: string;
     sp: string;
 };
+export declare const errorMessagesFromValue: Record<string, string>;
+export declare function detectErrorFromValue(input: string): string;
+export declare function customErrorMessage(errorMessage: string): string;
 export declare function valueIsError(value: string): boolean;
 export declare function isRealNull(val: any): boolean;
 export declare function isHexValue(str: string): boolean;

package/lib/modules/validation.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.customErrorMessage = customErrorMessage;
+exports.detectErrorFromValue = detectErrorFromValue;
 exports.diff = diff;
-exports.error = void 0;
+exports.errorMessagesFromValue = exports.error = void 0;
 exports.hasPartMC = hasPartMC;
 exports.isHexValue = isHexValue;
 exports.isRealNull = isRealNull;
@@ -15,8 +17,10 @@ exports.isdatetime = isdatetime;
 exports.valueIsError = valueIsError;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _lodash = _interopRequireDefault(require("lodash"));
+var _formulaParser = require("@fileverse-dev/formula-parser");
 var _text = require("./text");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _a;
 var error = exports.error = {
   v: "#VALUE!",
   n: "#NAME?",
@@ -27,6 +31,16 @@ var error = exports.error = {
   nl: "#NULL!",
   sp: "#SPILL!"
 };
+var errorMessagesFromValue = exports.errorMessagesFromValue = (_a = {}, _a[_formulaParser.ERROR_DIV_ZERO] = "Invalid calculation: the divisor (second value) cannot be zero", _a[_formulaParser.ERROR_NAME] = "Wrong function name or parameter", _a[_formulaParser.ERROR_NULL] = "Formula returned null", _a[_formulaParser.ERROR_NUM] = "Invalid number", _a[_formulaParser.ERROR_REF] = "Invalid reference", _a[_formulaParser.ERROR_VALUE] = "Invalid value", _a[_formulaParser.ERROR] = "Unknown error", _a);
+function detectErrorFromValue(input) {
+  return errorMessagesFromValue[input];
+}
+function customErrorMessage(errorMessage) {
+  if (errorMessage === (0, _formulaParser.error)(_formulaParser.ERROR_NAME)) {
+    return "#ERROR";
+  }
+  return errorMessage;
+}
 var errorValues = Object.values(error);
 function valueIsError(value) {
   return errorValues.includes(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.1.66-error-2",
+  "version": "1.1.66-error-4",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",