Merge pull request #224 from anmcgrath/formula-fixes

Formula fixes

Author: anmcgrath

src/BlazorDatasheet.Core/Edit/Editor.cs

@@ -205,8 +205,11 @@ public bool AcceptEdit()
         }
 
         var formulaResult = isFormula ? Sheet.FormulaEngine.Evaluate(parsedFormula) : CellValue.Empty;
+        
         var editValue =
-            isFormula ? formulaResult : Sheet.Cells.ConvertToCellValue(EditCell.Row, EditCell.Col, EditValue);
+            isFormula ? formulaResult :
+                Sheet.Cells.ConvertToCellValue(EditCell.Row, EditCell.Col, 
+                    string.IsNullOrEmpty(EditValue) ? null : EditValue); // set empty string to null to clear cell
 
         // don't accept edit if not a formula and the value is the same as previous.
         if (!isFormula && editValue.IsEqualTo(EditCell.CellValue))

src/BlazorDatasheet.Formula.Core/CellValue.cs

@@ -15,7 +15,7 @@ public class CellValue : IComparable, IComparable<CellValue>
 
     public CellValue(object? data)
     {
-        if (data == null)
+        if (data == null || (data is string str && str.Length == 0))
         {
             Data = null;
             IsEmpty = true;
@@ -289,6 +289,11 @@ public bool IsCellReference()
 
     public bool IsEqualTo(CellValue value)
     {
+        // special handling of empty cell vs empty string.
+        if (value.IsEmpty && string.IsNullOrEmpty(Data?.ToString()) ||
+            IsEmpty && string.IsNullOrEmpty(value.Data?.ToString()))
+            return true;
+
         if (ValueType != value.ValueType)
             return false;
 

src/BlazorDatasheet.Formula.Core/Interpreter/Evaluation/CellValueCoercer.cs

@@ -98,7 +98,7 @@ public bool TryCoerceBool(CellValue cellValue, out bool val)
 
 
         if (cellValue.IsEmpty)
-            return false;
+            return true; // val = false
 
         if (cellValue.ValueType == CellValueType.Logical)
         {
@@ -146,10 +146,10 @@ public bool TryCoerceString(CellValue cellValue, out string str)
             return false;
         }
 
-        if (cellValue.Data == null)
+        if (cellValue.IsEmpty)
             str = string.Empty;
         else
-            str = cellValue.Data.ToString()!;
+            str = cellValue.Data!.ToString()!;
 
         return true;
     }

src/BlazorDatasheet.Formula.Core/Interpreter/Evaluation/Evaluator.cs

@@ -195,10 +195,10 @@ private CellValue EvaluateFunctionCall(FunctionExpression node)
             var paramDefinition = paramDefinitions[paramIndex];
             var arg = EvaluateExpression(node.Args[argIndex]);
 
-            if (arg.IsError() && !func.AcceptsErrors)
-                return arg;
-
             convertedArgs[argIndex] = _parameterConverter.ConvertVal(arg, paramDefinition.Type);
+            
+            if (convertedArgs[argIndex].IsError() && !func.AcceptsErrors)
+                return convertedArgs[argIndex];
 
             if (IsConsumable(paramDefinition))
                 paramIndex++;

src/BlazorDatasheet.Formula.Functions/Logical/NotFunction.cs

@@ -0,0 +1,23 @@
+using BlazorDatasheet.Formula.Core;
+
+namespace BlazorDatasheet.Formula.Functions.Logical;
+
+public class NotFunction : ISheetFunction
+{
+    public ParameterDefinition[] GetParameterDefinitions()
+    {
+        return new ParameterDefinition[]
+        {
+            new("value", ParameterType.Logical, ParameterRequirement.Required)
+        };
+    }
+
+    public CellValue Call(CellValue[] args, FunctionCallMetaData metaData)
+    {
+        var val = args[0].GetValue<bool>();
+        return CellValue.Logical(!val);
+    }
+
+    public bool AcceptsErrors => false;
+    public bool IsVolatile => false;
+}

src/BlazorDatasheet.Formula.Functions/Math/PowerFunction.cs

@@ -21,16 +21,10 @@ public ParameterDefinition[] GetParameterDefinitions()
 
     public CellValue Call(CellValue[] args, FunctionCallMetaData metaData)
     {
-        var number = args[0];
-        var exponent = args[1];
+        var number = args[0].GetValue<double>();
+        var exponent = args[1].GetValue<double>();
 
-        if (number.ValueType != CellValueType.Number)
-            return CellValue.Error(ErrorType.Value);
-        
-        if (exponent.ValueType != CellValueType.Number)
-            return CellValue.Error(ErrorType.Value);
-
-        return CellValue.Number(System.Math.Pow((double)number.Data!, (double)exponent.Data!));
+        return CellValue.Number(System.Math.Pow(number, exponent));
     }
 
     public bool AcceptsErrors => false;

src/BlazorDatasheet.Formula.Functions/Math/SinFunction.cs

@@ -18,10 +18,6 @@ public ParameterDefinition[] GetParameterDefinitions()
     public CellValue Call(CellValue[] args, FunctionCallMetaData metaData)
     {
         var val = args[0];
-
-        if (val.ValueType != CellValueType.Number)
-            return CellValue.Error(ErrorType.Value);
-
         return CellValue.Number(System.Math.Sin((double)val.Data!));
     }
 

src/BlazorDatasheet.Formula.Functions/RegisterExtensions.cs

@@ -12,6 +12,7 @@ public static void RegisterLogicalFunctions(this IEnvironment e)
         e.RegisterFunction("AND", new AndFunction());
         e.RegisterFunction("IF", new IfFunction());
         e.RegisterFunction("OR", new OrFunction());
+        e.RegisterFunction("NOT", new NotFunction());
     }
 
     public static void RegisterMathFunctions(this IEnvironment e)

src/BlazorDatasheet.SharedPages/Components/Pages/Home.razor

@@ -26,7 +26,6 @@
 
     <div style="width: 600px; height: 400px; overflow-y: scroll;">
         <Datasheet
-            UseAutoFill="_useAutoFIll"
             FrozenBottomCount="1"
             Sheet="_sheet" @ref="_datasheet"/>
     </div>
@@ -72,7 +71,6 @@
 
     private Sheet _sheet = null!;
     private Datasheet? _datasheet;
-    private bool _useAutoFIll;
 
     protected override void OnInitialized()
     {

src/BlazorDatasheet/Extensions/ServiceCollectionExtensions.cs

@@ -1,7 +1,5 @@
-using BlazorDatasheet.Portal;
-using BlazorDatasheet.Services;
+using BlazorDatasheet.Services;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace BlazorDatasheet.Extensions;
 
@@ -10,7 +8,6 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddBlazorDatasheet(this IServiceCollection services)
     {
         services.AddScoped<IMenuService, MenuService>();
-        services.TryAddScoped<PortalService>();
         return services;
     }
 }