- update

Author: NinjaRocks

.github/workflows/Master-CodeQL.yml

@@ -7,70 +7,102 @@
 # ******** NOTE ********
 # We have attempted to detect the languages in your repository. Please check
 # the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages. 
+# supported CodeQL languages.
 #
 name: "master-codeql"
 
 on:
   push:
+    branches: [ "master" ]
+    paths-ignore:
+    - "**/*.md"
+    - "**/*.gitignore"
+    - "**/*.gitattributes"
   pull_request:
-    types: [opened, reopened, edited, synchronize]
+    branches: [ "master" ]
     paths-ignore:
     - "**/*.md"
     - "**/*.gitignore"
     - "**/*.gitattributes"
   schedule:
-    - cron: '35 15 * * 2'
+    - cron: '42 7 * * 5'
 
 jobs:
   analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
     permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
       actions: read
       contents: read
-      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'csharp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
+        include:
+        - language: actions
+          build-mode: none
+        - language: csharp
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
 
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
-        category: "/language:${{matrix.language}}"
+        category: "/language:${{matrix.language}}"

src/Parsley/IocExtensions.cs

@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace parsley
+{
+    public static class IocExtensions
+    {
+        public static IServiceCollection UseParsley(this IServiceCollection services, char delimeter = ',')
+        {
+            services.AddTransient(typeof(IParser), c => new Parser(delimeter));
+            return services;
+        }
+    }
+}

src/parsley/Extensions.cs

@@ -2,12 +2,7 @@ namespace parsley
 {
     internal static class Extensions
     {
-        public static bool In(this string input, params string[] values)
-        {
-            return values != null && values.Contains(input);
-        }
-
-        public static void SetError(this IFileLine obj, string error)
+        internal static void SetError(this IFileLine obj, string error)
         {
             if (obj.Errors == null)
                 obj.Errors = new List<string>();

src/parsley/IFileLine.cs

@@ -2,7 +2,7 @@ namespace parsley
 {
     public interface IFileLine
     {
-        int Index { get; set; }
-        IList<string> Errors { get; set; }
+        public int Index { get; set; }
+        public IList<string> Errors { get; set; }
     }
 }

src/parsley/Parsley.csproj

@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
+  </ItemGroup>
+
 </Project>

tests/Parsley.Tests/FileLine.cs

@@ -18,7 +18,7 @@ public FileLine()
         public int Code { get; set; }
 
         [Column(1)]
-        public Name Name { get; set; }
+        public NameType Name { get; set; }
 
         [Column(2)]
         public bool IsActive { get; set; }
@@ -28,31 +28,31 @@ public FileLine()
     }
 
     [TypeConverter(typeof(NameConverter))]
-    public class Name
+    public class NameType
     {
         public string FirstName { get; set; }
         public string Surname { get; set; }
 
-        public static Name Parse(string input)
+        public static NameType Parse(string input)
         {
             var values = input.Split(' ');
 
             if (values.Length == 1)
-                return new Name { FirstName = values[0] };
+                return new NameType { FirstName = values[0] };
 
             if (values.Length == 2)
-                return new Name { FirstName = values[0], Surname = values[1] };
+                return new NameType { FirstName = values[0], Surname = values[1] };
 
             if (values.Length > 2)
             {
                 var forenames = string.Empty;
                 for (var i = 0; i < values.Length - 1; i++)
                     forenames += string.Concat(values[i]) + " ";
 
-                return new Name { FirstName = forenames.Trim(), Surname = values[values.Length - 1] };
+                return new NameType { FirstName = forenames.Trim(), Surname = values[values.Length - 1] };
             }
 
-            return new Name { FirstName = input };
+            return new NameType { FirstName = input };
         }
     }
 
@@ -73,7 +73,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 
             if (!string.IsNullOrEmpty(stringValue))
             {
-                result = Name.Parse(stringValue);
+                result = NameType.Parse(stringValue);
             }
 
             return result ?? base.ConvertFrom(context, culture, value);

tests/Parsley.Tests/ParserFixture.cs

@@ -34,15 +34,15 @@ public void TestParseWithFileInputShouldReturnCorrectlyParsedArray()
             Assert.That(parsed.Length, Is.EqualTo(2));
 
             Assert.That(parsed[0].Code, Is.EqualTo(1));
-            //Assert.That(parsed[0].Name, Is.EqualTo("Bob Marley"));
+            //Assert.That(parsed[0].NameType, Is.EqualTo("Bob Marley"));
             Assert.That(parsed[0].Name.FirstName, Is.EqualTo("Bob"));
             Assert.That(parsed[0].Name.Surname, Is.EqualTo("Marley"));
             Assert.That(parsed[0].IsActive, Is.EqualTo(true));
             Assert.That(parsed[0].Subcription, Is.EqualTo(Subcription.Free));
             Assert.That(parsed[0].Errors, Is.Empty);
 
             Assert.That(parsed[1].Code, Is.EqualTo(2));
-            //Assert.That(parsed[1].Name, Is.EqualTo("John Walsh"));
+            //Assert.That(parsed[1].NameType, Is.EqualTo("John Walsh"));
             Assert.That(parsed[1].Name.FirstName, Is.EqualTo("John Walsh"));
             Assert.That(parsed[1].Name.Surname, Is.EqualTo("McKinsey"));
             Assert.That(parsed[1].IsActive, Is.EqualTo(false));
@@ -66,15 +66,15 @@ public void TestParseWithStringArrayInputShouldReturnCorrectlyParsedArray()
             Assert.That(parsed.Length, Is.EqualTo(2));
 
             Assert.That(parsed[0].Code, Is.EqualTo(1));
-            //Assert.That(parsed[0].Name, Is.EqualTo("Bob Marley"));
+            //Assert.That(parsed[0].NameType, Is.EqualTo("Bob Marley"));
             Assert.That(parsed[0].Name.FirstName, Is.EqualTo("Bob"));
             Assert.That(parsed[0].Name.Surname, Is.EqualTo("Marley"));
             Assert.That(parsed[0].IsActive, Is.EqualTo(true));
             Assert.That(parsed[0].Subcription, Is.EqualTo(Subcription.Free));
             Assert.That(parsed[0].Errors, Is.Empty);
 
             Assert.That(parsed[1].Code, Is.EqualTo(2));
-            //Assert.That(parsed[1].Name, Is.EqualTo("John Walsh"));
+            //Assert.That(parsed[1].NameType, Is.EqualTo("John Walsh"));
             Assert.That(parsed[1].Name.FirstName, Is.EqualTo("John Walsh"));
             Assert.That(parsed[1].Name.Surname, Is.EqualTo("McKinsey"));
             Assert.That(parsed[1].IsActive, Is.EqualTo(false));