Refactor file organization for improved maintainability (#38)

Author: leogdion

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "Swift",
-    "image": "swiftlang/swift:nightly-6.1-jammy",
+    "image": "swift:6.2",
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": "false",

.devcontainer/swift-6.0/devcontainer.json

@@ -1,5 +1,5 @@
 {
-    "name": "Swift",
+    "name": "Swift 6.0",
     "image": "swift:6.0",
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

.devcontainer/swift-6.1/devcontainer.json

@@ -1,6 +1,6 @@
 {
-    "name": "Swift",
-    "image": "swiftlang/swift:nightly-6.1-jammy",
+    "name": "Swift 6.1",
+    "image": "swift:6.1",
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": "false",

.devcontainer/swift-6.2/devcontainer.json

@@ -0,0 +1,40 @@
+{
+    "name": "Swift 6.2",
+    "image": "swiftlang/swift:6.2",
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "installZsh": "false",
+            "username": "vscode",
+            "upgradePackages": "false"
+        },
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "os-provided",
+            "ppa": "false"
+        }
+    },
+    "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
+    "runArgs": [
+        "--cap-add=SYS_PTRACE",
+        "--security-opt",
+        "seccomp=unconfined"
+    ],
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Set *default* container specific settings.json values on container create.
+            "settings": {
+                "lldb.library": "/usr/lib/liblldb.so"
+            },
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "sswg.swift-lang"
+            ]
+        }
+    },
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+
+    // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "root"
+}

.devcontainer/swift-6.3/devcontainer.json

@@ -0,0 +1,40 @@
+{
+    "name": "Swift 6.3",
+    "image": "swiftlang/swift:nightly-6.3-jammy",
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "installZsh": "false",
+            "username": "vscode",
+            "upgradePackages": "false"
+        },
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "os-provided",
+            "ppa": "false"
+        }
+    },
+    "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
+    "runArgs": [
+        "--cap-add=SYS_PTRACE",
+        "--security-opt",
+        "seccomp=unconfined"
+    ],
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Set *default* container specific settings.json values on container create.
+            "settings": {
+                "lldb.library": "/usr/lib/liblldb.so"
+            },
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "sswg.swift-lang"
+            ]
+        }
+    },
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+
+    // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "root"
+}

.github/workflows/RadiantKit.yml

@@ -213,7 +213,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-mint-  
       - name: Install mint
-        if: steps.cache-mint.outputs.cache-hit != 'true'
+        if: steps.cache-mint.outputs.cache-hit == ''
         run: |
           git clone https://github.com/yonaskolb/Mint.git
           cd Mint

.swift-format

@@ -6,11 +6,11 @@
     "spaces" : 2
   },
   "indentConditionalCompilationBlocks" : true,
-  "indentSwitchCaseLabels" : true,
-  "lineBreakAroundMultilineExpressionChainComponents" : true,
-  "lineBreakBeforeControlFlowKeywords" : true,
-  "lineBreakBeforeEachArgument" : true,
-  "lineBreakBeforeEachGenericRequirement" : true,
+  "indentSwitchCaseLabels" : false,
+  "lineBreakAroundMultilineExpressionChainComponents" : false,
+  "lineBreakBeforeControlFlowKeywords" : false,
+  "lineBreakBeforeEachArgument" : false,
+  "lineBreakBeforeEachGenericRequirement" : false,
   "lineLength" : 100,
   "maximumBlankLines" : 1,
   "multiElementCollectionTrailingCommas" : true,
@@ -26,7 +26,7 @@
     "AlwaysUseLiteralForEmptyCollectionInit" : false,
     "AlwaysUseLowerCamelCase" : true,
     "AmbiguousTrailingClosureOverload" : true,
-    "BeginDocumentationCommentWithOneLineSummary" : true,
+    "BeginDocumentationCommentWithOneLineSummary" : false,
     "DoNotUseSemicolons" : true,
     "DontRepeatTypeInStaticProperties" : true,
     "FileScopedDeclarationPrivacy" : false,
@@ -42,7 +42,7 @@
     "NoCasesWithOnlyFallthrough" : true,
     "NoEmptyTrailingClosureParentheses" : true,
     "NoLabelsInCasePatterns" : true,
-    "NoLeadingUnderscores" : false,
+    "NoLeadingUnderscores" : true,
     "NoParensAroundConditions" : true,
     "NoPlaygroundLiterals" : true,
     "NoVoidReturnOnFunctionSignature" : true,
@@ -67,4 +67,4 @@
   "spacesAroundRangeFormationOperators" : false,
   "tabWidth" : 2,
   "version" : 1
-}
+}

.swiftlint.yml

@@ -1,6 +1,5 @@
 opt_in_rules:
   - array_init
-  - attributes
   - closure_body_length
   - closure_end_indentation
   - closure_spacing
@@ -22,14 +21,15 @@ opt_in_rules:
   - explicit_acl
   - explicit_init
   - explicit_top_level_acl
-  - fallthrough
+  # - fallthrough
   - fatal_error_message
   - file_name
   - file_name_no_space
   - file_types_order
+  - first_where
   - flatmap_over_map_reduce
   - force_unwrapping
-  - function_default_parameter_at_end
+#  - function_default_parameter_at_end
   - ibinspectable_in_extension
   - identical_operands
   - implicit_return
@@ -41,8 +41,9 @@ opt_in_rules:
   - legacy_random
   - literal_expression_end_indentation
   - lower_acl_than_parent
-  #- missing_docs
+  - missing_docs
   - modifier_order
+  - multiline_arguments
   - multiline_arguments_brackets
   - multiline_function_chains
   - multiline_literal_brackets
@@ -56,7 +57,6 @@ opt_in_rules:
   - optional_enum_case_matching
   - overridden_super_call
   - override_in_extension
-  - pattern_matching_keywords
   - prefer_self_type_over_type_of_self
   - prefer_zero_over_explicit_init
   - private_action
@@ -74,48 +74,65 @@ opt_in_rules:
   - sorted_first_last
   - sorted_imports
   - static_operator
-  - strict_fileprivate
   - strong_iboutlet
   - toggle_bool
+#  - trailing_closure
   - type_contents_order
   - unavailable_function
   - unneeded_parentheses_in_closure_argument
   - unowned_variable_capture
+  - untyped_error_in_catch
   - vertical_parameter_alignment_on_call
-  - vertical_whitespace_between_cases
   - vertical_whitespace_closing_braces
   - vertical_whitespace_opening_braces
   - xct_specific_matcher
   - yoda_condition
-disabled_rules:
-  - trailing_comma
-  - strict_fileprivate
-  - function_default_parameter_at_end
-  - switch_case_alignment
+analyzer_rules:
+  - unused_import
+  - unused_declaration
 cyclomatic_complexity:
   - 6
-  - 8
-type_body_length:
-  - 125
-  - 200
+  - 12
 file_length:
-  - 250
-  - 300
+  warning: 225
+  error: 300
 function_body_length:
-  - 25
-  - 35
+  - 50
+  - 76
 function_parameter_count: 8
 line_length:
-  - 90
-  - 90
+  - 100
+  - 200
+closure_body_length:
+  - 50
+  - 60
 identifier_name:
   excluded:
     - id
-    - completeFileProtectionUntilFirstUserAuthentication
+    - no
 excluded:
   - DerivedData
   - .build
-  - .swiftpm
   - Mint
+  - Examples
 indentation_width:
   indentation_width: 2
+file_name:
+    severity: error
+fatal_error_message:
+    severity: error
+disabled_rules:
+    - nesting
+    - implicit_getter
+    - switch_case_alignment
+    - closure_parameter_position
+    - trailing_comma
+    - opening_brace
+    - optional_data_string_conversion
+    - pattern_matching_keywords
+custom_rules:
+  no_unchecked_sendable:
+    name: "No Unchecked Sendable"
+    regex: '@unchecked\s+Sendable'
+    message: "Use proper Sendable conformance instead of @unchecked Sendable to maintain strict concurrency safety"
+    severity: error

Mintfile

@@ -1,3 +1,3 @@
-swiftlang/swift-format@600.0.0
-realm/SwiftLint@0.58.0
-peripheryapp/periphery@2.20.0
+swiftlang/swift-format@602.0.0
+realm/SwiftLint@0.62.2
+peripheryapp/periphery@3.2.0

Sources/RadiantDocs/CodablePackageDocument.swift

@@ -83,7 +83,8 @@
           configuration.existingFile ?? FileWrapper(directoryWithFileWrappers: [:])
 
         if let oldConfigJSONWrapper = rootFileWrapper
-          .fileWrappers?[T.configurationFileWrapperKey] {
+          .fileWrappers?[T.configurationFileWrapperKey]
+        {
           rootFileWrapper.removeFileWrapper(oldConfigJSONWrapper)
         }