Refactoring for nullable (#1870)

src/PSRule.Types/Definitions/ISourceExtent.cs

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace PSRule.Definitions;
+
+/// <summary>
+/// A source location for a PSRule expression.
+/// </summary>
+public interface ISourceExtent
+{
+    /// <summary>
+    /// The source file path.
+    /// </summary>
+    string File { get; }
+
+    /// <summary>
+    /// The first line of the expression.
+    /// </summary>
+    int? Line { get; }
+
+    /// <summary>
+    /// The first position of the expression.
+    /// </summary>
+    int? Position { get; }
+}

src/PSRule/Definitions/InfoString.cs → src/PSRule.Types/Definitions/InfoString.cs

@@ -11,12 +11,12 @@ namespace PSRule.Definitions;
 [DebuggerDisplay("{Text}")]
 public sealed class InfoString
 {
-    private string _Text;
-    private string _Markdown;
+    private string? _Text;
+    private string? _Markdown;
 
     internal InfoString() { }
 
-    internal InfoString(string text, string markdown = null)
+    internal InfoString(string text, string? markdown = null)
     {
         Text = text;
         Markdown = markdown ?? text;
@@ -33,7 +33,7 @@ public bool HasValue
     /// <summary>
     /// A plain text representation.
     /// </summary>
-    public string Text
+    public string? Text
     {
         get { return _Text; }
         set
@@ -46,7 +46,7 @@ public string Text
     /// <summary>
     /// A markdown formatted representation if set. Otherwise this is the same as <see cref="Text"/>.
     /// </summary>
-    public string Markdown
+    public string? Markdown
     {
         get { return _Markdown; }
         set
@@ -59,7 +59,7 @@ public string Markdown
     /// <summary>
     /// Create an info string when not null or empty.
     /// </summary>
-    internal static InfoString Create(string text, string markdown = null)
+    internal static InfoString? Create(string text, string? markdown = null)
     {
         return string.IsNullOrEmpty(text) && string.IsNullOrEmpty(markdown) ? null : new InfoString(text, markdown);
     }

src/PSRule/Definitions/SourceExtent.cs

@@ -3,27 +3,6 @@
 
 namespace PSRule.Definitions;
 
-/// <summary>
-/// A source location for a PSRule expression.
-/// </summary>
-public interface ISourceExtent
-{
-    /// <summary>
-    /// The source file path.
-    /// </summary>
-    string File { get; }
-
-    /// <summary>
-    /// The first line of the expression.
-    /// </summary>
-    int? Line { get; }
-
-    /// <summary>
-    /// The first position of the expression.
-    /// </summary>
-    int? Position { get; }
-}
-
 internal sealed class SourceExtent : ISourceExtent
 {
     internal SourceExtent(string file, int? line)

src/PSRule/Pipeline/Dependencies/LockFile.cs

@@ -31,22 +31,22 @@ public sealed class LockFile
     /// </summary>
     /// <param name="path">An alternative path to the lock file.</param>
     /// <returns>Returns an instance of the lock file or a default instance if the file does not exist.</returns>
-    public static LockFile Read(string path)
+    public static LockFile Read(string? path)
     {
         path = Environment.GetRootedPath(path);
         path = Path.GetExtension(path) == ".json" ? path : Path.Combine(path, DEFAULT_FILE);
-        LockFile result = null;
+        LockFile? result = null;
         if (File.Exists(path))
         {
             var json = File.ReadAllText(path, Encoding.UTF8);
             result = JsonConvert.DeserializeObject<LockFile>(json, new JsonSerializerSettings
             {
-                Converters = new List<JsonConverter>
-                {
+                Converters =
+                [
                     new SemanticVersionConverter()
-                },
+                ],
             });
-            return result;
+            return result ?? new LockFile();
         }
         result ??= new LockFile();
         result.Modules ??= new Dictionary<string, LockEntry>(StringComparer.OrdinalIgnoreCase);
@@ -57,18 +57,18 @@ public static LockFile Read(string path)
     /// Write the lock file to disk.
     /// </summary>
     /// <param name="path">An alternative path to the lock file.</param>
-    public void Write(string path)
+    public void Write(string? path)
     {
         Version = 1;
 
         path = Environment.GetRootedPath(path);
         path = Path.GetExtension(path) == "json" ? path : Path.Combine(path, DEFAULT_FILE);
         var json = JsonConvert.SerializeObject(this, Formatting.Indented, new JsonSerializerSettings
         {
-            Converters = new List<JsonConverter>
-            {
+            Converters =
+            [
                 new SemanticVersionConverter()
-            }
+            ]
         });
         File.WriteAllText(path, json, Encoding.UTF8);
     }

src/PSRule/Runtime/RuleConditionHelper.cs

@@ -24,7 +24,7 @@ internal static RuleConditionResult Create(IEnumerable<object> value)
             var baseObject = ExpressionHelpers.GetBaseObject(v);
             if (!(TryAssertResult(baseObject, out var result) || TryBoolean(baseObject, out result)))
             {
-                RunspaceContext.CurrentThread.ErrorInvaildRuleResult();
+                RunspaceContext.CurrentThread.ErrorInvalidRuleResult();
                 hasErrors = true;
             }
             else if (result)