Minor refactors.

Ygg01 · Jan 7, 2024 · f4df5d0 · f4df5d0
1 parent ebca66b
commit f4df5d0
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 30 deletions.
diff --git a/Linguini.Bundle.Test/Yaml/YamlSuiteParser.cs b/Linguini.Bundle.Test/Yaml/YamlSuiteParser.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using Linguini.Bundle.Builder;
 using Linguini.Bundle.Errors;
-using Linguini.Bundle.Func;
+using Linguini.Bundle.Function;
 using Linguini.Bundle.Types;
 using NUnit.Framework;
 using YamlDotNet.RepresentationModel;

diff --git a/Linguini.Bundle/ConcurrentBundle.cs b/Linguini.Bundle/ConcurrentBundle.cs
@@ -2,9 +2,11 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
 using Linguini.Bundle.Errors;
 using Linguini.Bundle.Types;
+using Linguini.Shared.Types.Bundle;
 using Linguini.Syntax.Ast;
 
 // ReSharper disable UnusedType.Global
@@ -13,7 +15,7 @@ namespace Linguini.Bundle
 {
     public sealed class ConcurrentBundle : FluentBundle
     {
-        internal ConcurrentDictionary<string, FluentFunction> _funcList = new();
+        internal ConcurrentDictionary<string, FluentFunction> FuncList = new();
         private ConcurrentDictionary<string, AstTerm> _terms = new();
         private ConcurrentDictionary<string, AstMessage> _messages = new();
 
@@ -51,19 +53,19 @@ protected override bool TryAddMessage(AstMessage message, List<FluentError>? err
         /// <inheritdoc />
         public override bool TryAddFunction(string funcName, ExternalFunction fluentFunction)
         {
-            return _funcList.TryAdd(funcName, fluentFunction);
+            return FuncList.TryAdd(funcName, fluentFunction);
         }
 
         /// <inheritdoc />
         public override void AddFunctionOverriding(string funcName, ExternalFunction fluentFunction)
         {
-            _funcList[funcName] = fluentFunction;
+            FuncList[funcName] = fluentFunction;
         }
 
         /// <inheritdoc />
         public override void AddFunctionUnchecked(string funcName, ExternalFunction fluentFunction)
         {
-            if (_funcList.TryAdd(funcName, fluentFunction)) return;
+            if (FuncList.TryAdd(funcName, fluentFunction)) return;
             throw new ArgumentException($"Function with name {funcName} already exist");
         }
 
@@ -89,7 +91,7 @@ public override bool TryGetAstTerm(string ident, [NotNullWhen(true)] out AstTerm
         /// <inheritdoc />
         public override bool TryGetFunction(string funcName, [NotNullWhen(true)] out FluentFunction? function)
         {
-            return _funcList.TryGetValue(funcName, out function);
+            return FuncList.TryGetValue(funcName, out function);
         }
 
         /// <inheritdoc />
@@ -101,25 +103,32 @@ public override IEnumerable<string> GetMessageEnumerable()
         /// <inheritdoc />
         public override IEnumerable<string> GetFuncEnumerable()
         {
-            return _funcList.Keys.ToArray();
+            return FuncList.Keys.ToArray();
         }
 
         /// <inheritdoc />
         public override IEnumerable<string> GetTermEnumerable()
         {
             return _terms.Keys.ToArray();
         }
-
-
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override FluentBundle DeepClone()
         {
-            return new ConcurrentBundle()
+            return new ConcurrentBundle
             {
-                _funcList = new ConcurrentDictionary<string, FluentFunction>(_funcList),
+                FuncList = new ConcurrentDictionary<string, FluentFunction>(FuncList),
                 _terms = new ConcurrentDictionary<string, AstTerm>(_terms),
                 _messages = new ConcurrentDictionary<string, AstMessage>(_messages),
+                Culture = (CultureInfo) Culture.Clone(),
+                Locales = new List<string>(Locales),
+                UseIsolating = UseIsolating,
+                TransformFunc = (Func<string, string>?)TransformFunc?.Clone(),
+                FormatterFunc = (Func<IFluentType, string>?)FormatterFunc?.Clone(),
+                MaxPlaceable = MaxPlaceable,
+                EnableExtensions = EnableExtensions,
             };
         }
+
     }
 }
diff --git a/Linguini.Bundle/FluentBundle.cs b/Linguini.Bundle/FluentBundle.cs
@@ -5,7 +5,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Xml.Schema;
 using Linguini.Bundle.Builder;
 using Linguini.Bundle.Errors;
 using Linguini.Bundle.Resolver;
@@ -18,7 +17,6 @@ namespace Linguini.Bundle
 {
     public abstract class FluentBundle
     {
-
         /// <summary>
         /// <see cref="CultureInfo"/> of the bundle. Primary bundle locale
         /// </summary>
@@ -48,7 +46,7 @@ public abstract class FluentBundle
         /// <summary>
         /// Limit of placeable <see cref="AstTerm"/> within one <see cref="Pattern"/>, when fully expanded (all nested elements count towards it). Useful for preventing billion laughs attack. Defaults to 100.
         /// </summary>
-        public byte MaxPlaceable { get; private init; } = 100;
+        public byte MaxPlaceable { get; internal init; } = 100;
 
         /// <summary>
         /// Whether experimental features are enabled.
@@ -60,7 +58,8 @@ public abstract class FluentBundle
         /// <item>term reference as parameters</item>
         /// </list>
         /// </summary>
-        public bool EnableExtensions { get; init; } = false;
+        // ReSharper disable once MemberCanBeProtected.Global
+        public bool EnableExtensions { get; init; }
 
         public bool AddResource(string input, [NotNullWhen(false)] out List<FluentError>? errors)
         {
@@ -350,6 +349,11 @@ public string FormatPattern(Pattern pattern, IDictionary<string, IFluentType>? a
         /// <returns>A new instance of the AbstractFluentBundle class that is a deep clone of the current instance.</returns>
         public abstract FluentBundle DeepClone();
 
+        /// <summary>
+        /// Creates a FluentBundle object with the specified options.
+        /// </summary>
+        /// <param name="option">The FluentBundleOption object that contains the options for creating the FluentBundle</param>
+        /// <returns>A FluentBundle object created with the specified options</returns>
         public static FluentBundle MakeUnchecked(FluentBundleOption option)
         {
             var primaryLocale = option.Locales.Count > 0
@@ -368,9 +372,9 @@ public static FluentBundle MakeUnchecked(FluentBundleOption option)
                     TransformFunc = option.TransformFunc,
                     MaxPlaceable = option.MaxPlaceable,
                     UseIsolating = option.UseIsolating,
-                    _funcList = new ConcurrentDictionary<string, FluentFunction>(func),
+                    FuncList = new ConcurrentDictionary<string, FluentFunction>(func),
                 },
-                _ => new NonConcurrentBundle()
+                _ => new NonConcurrentBundle
                 {
                     Locales = option.Locales,
                     Culture = cultureInfo,
@@ -379,7 +383,7 @@ public static FluentBundle MakeUnchecked(FluentBundleOption option)
                     TransformFunc = option.TransformFunc,
                     MaxPlaceable = option.MaxPlaceable,
                     UseIsolating = option.UseIsolating,
-                    _funcList = func,
+                    FuncList = func,
                 }
             };
         }

diff --git a/Linguini.Bundle/FrozenBundle.cs b/Linguini.Bundle/FrozenBundle.cs
@@ -0,0 +1,7 @@
+namespace Linguini.Bundle
+{
+    public class FrozenBundle
+    {
+
+    }
+}
diff --git a/...ini.Bundle/Func/LinguiniFluentFunction.cs → ...Bundle/Function/LinguiniFluentFunction.cs b/...ini.Bundle/Func/LinguiniFluentFunction.cs → ...Bundle/Function/LinguiniFluentFunction.cs
@@ -5,7 +5,7 @@
 using Linguini.Bundle.Types;
 using Linguini.Shared.Types.Bundle;
 
-namespace Linguini.Bundle.Func
+namespace Linguini.Bundle.Function
 {
     public static class LinguiniFluentFunctions
     {

diff --git a/Linguini.Bundle/NonConcurrentBundle.cs b/Linguini.Bundle/NonConcurrentBundle.cs
@@ -1,8 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
 using Linguini.Bundle.Errors;
 using Linguini.Bundle.Types;
+using Linguini.Shared.Types.Bundle;
 using Linguini.Syntax.Ast;
 
 // ReSharper disable UnusedType.Global
@@ -11,9 +14,9 @@ namespace Linguini.Bundle
 {
     public sealed class NonConcurrentBundle : FluentBundle
     {
-        internal Dictionary<string, FluentFunction> _funcList = new();
-        internal Dictionary<string, AstTerm> _terms = new();
-        internal Dictionary<string, AstMessage> _messages = new();
+        internal Dictionary<string, FluentFunction> FuncList = new();
+        private Dictionary<string, AstTerm> _terms = new();
+        private Dictionary<string, AstMessage> _messages = new();
 
         /// <inheritdoc />
         protected override void AddMessageOverriding(AstMessage message)
@@ -49,19 +52,19 @@ protected override bool TryAddMessage(AstMessage message, List<FluentError>? err
         /// <inheritdoc />
         public override bool TryAddFunction(string funcName, ExternalFunction fluentFunction)
         {
-            return _funcList.TryAdd(funcName, fluentFunction);
+            return FuncList.TryAdd(funcName, fluentFunction);
         }
 
         /// <inheritdoc />
         public override void AddFunctionOverriding(string funcName, ExternalFunction fluentFunction)
         {
-            _funcList[funcName] = fluentFunction;
+            FuncList[funcName] = fluentFunction;
         }
 
         /// <inheritdoc />
         public override void AddFunctionUnchecked(string funcName, ExternalFunction fluentFunction)
         {
-            _funcList.Add(funcName, fluentFunction);
+            FuncList.Add(funcName, fluentFunction);
         }
 
         /// <inheritdoc />
@@ -86,7 +89,7 @@ public override bool TryGetAstTerm(string ident, [NotNullWhen(true)] out AstTerm
         /// <inheritdoc />
         public override bool TryGetFunction(string funcName, [NotNullWhen(true)] out FluentFunction? function)
         {
-            return _funcList.TryGetValue(funcName, out function);
+            return FuncList.TryGetValue(funcName, out function);
         }
 
         /// <inheritdoc />
@@ -98,7 +101,7 @@ public override IEnumerable<string> GetMessageEnumerable()
         /// <inheritdoc />
         public override IEnumerable<string> GetFuncEnumerable()
         {
-            return _funcList.Keys.ToArray();
+            return FuncList.Keys.ToArray();
         }
 
         /// <inheritdoc />
@@ -113,9 +116,16 @@ public override FluentBundle DeepClone()
         {
             return new NonConcurrentBundle()
             {
-                _funcList = new Dictionary<string, FluentFunction>(_funcList),
+                FuncList = new Dictionary<string, FluentFunction>(FuncList),
                 _terms = new Dictionary<string, AstTerm>(_terms),
                 _messages = new Dictionary<string, AstMessage>(_messages),
+                Culture = (CultureInfo) Culture.Clone(),
+                Locales = new List<string>(Locales),
+                UseIsolating = UseIsolating,
+                TransformFunc = (Func<string, string>?)TransformFunc?.Clone(),
+                FormatterFunc = (Func<IFluentType, string>?)FormatterFunc?.Clone(),
+                MaxPlaceable = MaxPlaceable,
+                EnableExtensions = EnableExtensions,
             };
         }
     }